diff options
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | misc/conf/zabbix_agentd.conf | 9 | ||||
-rw-r--r-- | misc/conf/zabbix_server.conf | 6 | ||||
-rw-r--r-- | src/zabbix_agent/zabbix_agentd.c | 9 | ||||
-rw-r--r-- | src/zabbix_server/poller/checks_agent.c | 4 | ||||
-rw-r--r-- | src/zabbix_server/server.c | 10 |
6 files changed, 13 insertions, 26 deletions
@@ -1,5 +1,6 @@ Changes for 1.1beta9: + - dropped support of experimental parameter NoTimeWait (Alexei) - removed unused escalator (Alexei) - removed escalation tables (Alexei) - fix compilation if no function atoll() (Alexei) diff --git a/misc/conf/zabbix_agentd.conf b/misc/conf/zabbix_agentd.conf index 86ca1e80..e3761c89 100644 --- a/misc/conf/zabbix_agentd.conf +++ b/misc/conf/zabbix_agentd.conf @@ -68,15 +68,6 @@ LogFile=/tmp/zabbix_agentd.log Timeout=3 -##### Experimental options. Use with care ! ##### - -# Get rid of sockets in TIME_WAIT state -# This will set socket option SO_LINGER - -# NoTimeWait=1 - -##### End of experimental options - ####### USER-DEFINED MONITORED PARAMETERS ####### # Format: UserParameter=<key>,<shell command> # Note that shell command must not return empty string or EOL only diff --git a/misc/conf/zabbix_server.conf b/misc/conf/zabbix_server.conf index b8d37f96..62f635be 100644 --- a/misc/conf/zabbix_server.conf +++ b/misc/conf/zabbix_server.conf @@ -97,9 +97,3 @@ DBUser=root # Connect to MySQL using Unix socket? #DBSocket=/tmp/mysql.sock - -# Experimental options. Use with care ! - -# Get rid of sockets in TIME_WAIT state -# This will set socket option SO_LINGER -# NoTimeWait=1 diff --git a/src/zabbix_agent/zabbix_agentd.c b/src/zabbix_agent/zabbix_agentd.c index 5123c260..f5201667 100644 --- a/src/zabbix_agent/zabbix_agentd.c +++ b/src/zabbix_agent/zabbix_agentd.c @@ -72,7 +72,7 @@ char *CONFIG_FILE = NULL; char *CONFIG_PID_FILE = NULL; char *CONFIG_LOG_FILE = NULL; int CONFIG_AGENTD_FORKS = AGENTD_FORKS; -int CONFIG_NOTIMEWAIT = 0; +/*int CONFIG_NOTIMEWAIT = 0;*/ int CONFIG_DISABLE_ACTIVE = 0; int CONFIG_ENABLE_REMOTE_COMMANDS = 0; int CONFIG_TIMEOUT = AGENT_TIMEOUT; @@ -244,7 +244,7 @@ void init_config(void) {"DisableActive",&CONFIG_DISABLE_ACTIVE,0,TYPE_INT,PARM_OPT,0,1}, {"EnableRemoteCommands",&CONFIG_ENABLE_REMOTE_COMMANDS,0,TYPE_INT,PARM_OPT,0,1}, {"Timeout",&CONFIG_TIMEOUT,0,TYPE_INT,PARM_OPT,1,30}, - {"NoTimeWait",&CONFIG_NOTIMEWAIT,0,TYPE_INT,PARM_OPT,0,1}, +/* {"NoTimeWait",&CONFIG_NOTIMEWAIT,0,TYPE_INT,PARM_OPT,0,1},*/ {"ListenPort",&CONFIG_LISTEN_PORT,0,TYPE_INT,PARM_OPT,1024,32767}, {"ServerPort",&CONFIG_SERVER_PORT,0,TYPE_INT,PARM_OPT,1024,32767}, {"ListenIP",&CONFIG_LISTEN_IP,0,TYPE_STRING,PARM_OPT,0,0}, @@ -374,7 +374,7 @@ int tcp_listen(const char *host, int port, socklen_t *addrlenp) int sockfd; struct sockaddr_in serv_addr; - struct linger ling; +/* struct linger ling;*/ if ( (sockfd = socket(AF_INET, SOCK_STREAM, 0)) == -1) { @@ -382,6 +382,7 @@ int tcp_listen(const char *host, int port, socklen_t *addrlenp) exit(1); } + /* if(CONFIG_NOTIMEWAIT == 1) { ling.l_onoff=1; @@ -390,7 +391,7 @@ int tcp_listen(const char *host, int port, socklen_t *addrlenp) { zabbix_log(LOG_LEVEL_WARNING, "Cannot setsockopt SO_LINGER [%s]", strerror(errno)); } - } + }*/ bzero((char *) &serv_addr, sizeof(serv_addr)); diff --git a/src/zabbix_server/poller/checks_agent.c b/src/zabbix_server/poller/checks_agent.c index 9d53688e..d9910292 100644 --- a/src/zabbix_server/poller/checks_agent.c +++ b/src/zabbix_server/poller/checks_agent.c @@ -85,7 +85,7 @@ int get_value_agent(DB_ITEM *item, AGENT_RESULT *result) servaddr_in.sin_port=htons(item->port); s=socket(AF_INET,SOCK_STREAM,0); - +/* if(CONFIG_NOTIMEWAIT == 1) { ling.l_onoff=1; @@ -94,7 +94,7 @@ int get_value_agent(DB_ITEM *item, AGENT_RESULT *result) { zabbix_log(LOG_LEVEL_WARNING, "Cannot setsockopt SO_LINGER [%s]", strerror(errno)); } - } + }*/ if(s == -1) { snprintf(error,MAX_STRING_LEN-1,"Cannot create socket [%s]", strerror(errno)); diff --git a/src/zabbix_server/server.c b/src/zabbix_server/server.c index 0bb244c5..220aae6c 100644 --- a/src/zabbix_server/server.c +++ b/src/zabbix_server/server.c @@ -71,7 +71,7 @@ int CONFIG_TRAPPERD_FORKS = TRAPPERD_FORKS; int CONFIG_LISTEN_PORT = 10051; int CONFIG_TRAPPER_TIMEOUT = TRAPPER_TIMEOUT; /**/ -int CONFIG_NOTIMEWAIT =0; +/*int CONFIG_NOTIMEWAIT =0;*/ int CONFIG_TIMEOUT =SUCKER_TIMEOUT; int CONFIG_HOUSEKEEPING_FREQUENCY = 1; int CONFIG_SENDER_FREQUENCY = 30; @@ -322,7 +322,7 @@ void init_config(void) {"TrapperTimeout",&CONFIG_TRAPPER_TIMEOUT,0,TYPE_INT,PARM_OPT,1,30}, {"UnavailablePeriod",&CONFIG_UNAVAILABLE_PERIOD,0,TYPE_INT,PARM_OPT,1,3600}, {"ListenPort",&CONFIG_LISTEN_PORT,0,TYPE_INT,PARM_OPT,1024,32768}, - {"NoTimeWait",&CONFIG_NOTIMEWAIT,0,TYPE_INT,PARM_OPT,0,1}, +/* {"NoTimeWait",&CONFIG_NOTIMEWAIT,0,TYPE_INT,PARM_OPT,0,1},*/ {"DisablePinger",&CONFIG_DISABLE_PINGER,0,TYPE_INT,PARM_OPT,0,1}, {"DisableHousekeeping",&CONFIG_DISABLE_HOUSEKEEPING,0,TYPE_INT,PARM_OPT,0,1}, {"DebugLevel",&CONFIG_LOG_LEVEL,0,TYPE_INT,PARM_OPT,0,4}, @@ -395,7 +395,7 @@ int tcp_listen(const char *host, int port, socklen_t *addrlenp) { int sockfd; struct sockaddr_in serv_addr; - struct linger ling; +/* struct linger ling;*/ if ( (sockfd = socket(AF_INET, SOCK_STREAM, 0)) == -1) { @@ -403,7 +403,7 @@ int tcp_listen(const char *host, int port, socklen_t *addrlenp) exit(1); } - if(CONFIG_NOTIMEWAIT == 1) +/* if(CONFIG_NOTIMEWAIT == 1) { ling.l_onoff=1; ling.l_linger=0; @@ -411,7 +411,7 @@ int tcp_listen(const char *host, int port, socklen_t *addrlenp) { zabbix_log(LOG_LEVEL_WARNING, "Cannot setsockopt SO_LINGER [%s]", strerror(errno)); } - } + }*/ bzero((char *) &serv_addr, sizeof(serv_addr)); serv_addr.sin_family = AF_INET; |