diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-21 10:37:59 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-21 10:37:59 +0200 |
| commit | 596383988792635f128cb645c9b7c8aae50453e6 (patch) | |
| tree | 5e5ba6dc03b6e9b687b09f49828b5a1fcdda1cda /tools/syslogd.c | |
| parent | 8624f937523c1ca78cc1d78b8eba18f628ae9ab5 (diff) | |
| parent | daa76ad94428599336ddafdd6854dc0b71356180 (diff) | |
| download | rsyslog-596383988792635f128cb645c9b7c8aae50453e6.tar.gz rsyslog-596383988792635f128cb645c9b7c8aae50453e6.tar.xz rsyslog-596383988792635f128cb645c9b7c8aae50453e6.zip | |
Merge branch 'v4-devel' into v4-beta
Diffstat (limited to 'tools/syslogd.c')
| -rw-r--r-- | tools/syslogd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index e52a524a..88588621 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -1218,7 +1218,7 @@ int parseLegacySyslogMsg(msg_t *pMsg, int flags) if(flags & PARSE_HOSTNAME) { i = 0; while((isalnum(p2parse[i]) || p2parse[i] == '.' || p2parse[i] == '.' - || p2parse[i] == '_') && i < CONF_TAG_MAXSIZE) { + || p2parse[i] == '_' || p2parse[i] == '-') && i < CONF_TAG_MAXSIZE) { bufParseHOSTNAME[i] = p2parse[i]; ++i; } @@ -2550,8 +2550,8 @@ mainloop(void) * powertop, for example). In that case, we primarily wait for a signal, * but a once-a-day wakeup should be quite acceptable. -- rgerhards, 2008-06-09 */ - //tvSelectTimeout.tv_sec = (bReduceRepeatMsgs == 1) ? TIMERINTVL : 86400 /*1 day*/; - tvSelectTimeout.tv_sec = TIMERINTVL; /* TODO: change this back to the above code when we have a better solution for apc */ + tvSelectTimeout.tv_sec = (bReduceRepeatMsgs == 1) ? TIMERINTVL : 86400 /*1 day*/; + //tvSelectTimeout.tv_sec = TIMERINTVL; /* TODO: change this back to the above code when we have a better solution for apc */ tvSelectTimeout.tv_usec = 0; select(1, NULL, NULL, NULL, &tvSelectTimeout); if(bFinished) @@ -2586,7 +2586,7 @@ mainloop(void) bHadHUP = 0; continue; } - execScheduled(); /* handle Apc calls (if any) */ + // TODO: remove execScheduled(); /* handle Apc calls (if any) */ } ENDfunc } |