From c70f82729539b2aa630d1ab5358e89128a0b3f9e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 10 Nov 2014 16:00:28 +0300 Subject: Add support for plugin options in map server config (logs.conf). --- src/common/HPMi.h | 3 +++ src/map/log.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/common/HPMi.h b/src/common/HPMi.h index 850f734ba..10a5ec082 100644 --- a/src/common/HPMi.h +++ b/src/common/HPMi.h @@ -89,6 +89,7 @@ enum HPluginConfType { HPCT_CHAR, /* char-server.conf (char-server) */ HPCT_CHAR_INTER, /* inter-server.conf (char-server) */ HPCT_MAP_INTER, /* inter-server.conf (map-server) */ + HPCT_LOG, /* logs.conf (map-server) */ HPCT_MAX, }; @@ -169,6 +170,8 @@ enum HPluginConfType { #define addCharInterConf(bcname,funcname) HPMi->addConf(HPMi->pid,HPCT_CHAR_INTER,bcname,funcname) /* HPMi->addMapInter */ #define addMapInterConf(bcname,funcname) HPMi->addConf(HPMi->pid,HPCT_MAP_INTER,bcname,funcname) +/* HPMi->addLog */ +#define addLogConf(bcname,funcname) HPMi->addConf(HPMi->pid,HPCT_LOG,bcname,funcname) /* HPMi->addPCGPermission */ #define addGroupPermission(pcgname,maskptr) HPMi->addPCGPermission(HPMi->pid,pcgname,&maskptr) diff --git a/src/map/log.c b/src/map/log.c index 3efcd09df..f0fd6795c 100644 --- a/src/map/log.c +++ b/src/map/log.c @@ -20,6 +20,7 @@ #include "../common/showmsg.h" #include "../common/sql.h" // SQL_INNODB #include "../common/strlib.h" +#include "../common/HPM.h" struct log_interface log_s; @@ -453,6 +454,8 @@ int log_config_read(const char* cfgName) { //support the import command, just like any other config else if( strcmpi(w1,"import") == 0 ) logs->config_read(w2); + else if (HPM->parseConf(w1, w2, HPCT_LOG)) + ; // handled by plugins else ShowWarning("Unknown setting '%s' in file %s\n", w1, cfgName); } -- cgit v1.2.3-70-g09d2