diff options
| author | Kozlov Dmitry <xeb@mail.ru> | 2011-12-27 12:43:24 +0400 |
|---|---|---|
| committer | Kozlov Dmitry <xeb@mail.ru> | 2011-12-27 12:43:24 +0400 |
| commit | d9252bc63289ec0b431e95a0c0814397421651bf (patch) | |
| tree | e694764cc3ad24fa8d86b991db48d192c6bf4233 | |
| parent | 8f8c2e0deb97d434cee9a03ac7411ee9e37ac542 (diff) | |
| download | accel-ppp-xebd-d9252bc63289ec0b431e95a0c0814397421651bf.tar.gz accel-ppp-xebd-d9252bc63289ec0b431e95a0c0814397421651bf.zip | |
Revert "implemented logging to system logger"
This reverts commit ee41cba691ab9f6461f4933461cf82be161333de.
| -rw-r--r-- | accel-pppd/accel-ppp.conf | 3 | ||||
| -rw-r--r-- | accel-pppd/accel-ppp.conf.5 | 4 | ||||
| -rw-r--r-- | accel-pppd/logs/CMakeLists.txt | 38 | ||||
| -rw-r--r-- | accel-pppd/triton/triton.c | 1 |
4 files changed, 7 insertions, 39 deletions
diff --git a/accel-pppd/accel-ppp.conf b/accel-pppd/accel-ppp.conf index 7219ba3..b8cf8a1 100644 --- a/accel-pppd/accel-ppp.conf +++ b/accel-pppd/accel-ppp.conf @@ -1,7 +1,6 @@ [modules] #path=/usr/local/lib/accel-ppp log_file -#log_syslog #log_tcp #log_pgsql pptp @@ -109,7 +108,6 @@ log-file=/var/log/accel-ppp/accel-ppp.log log-emerg=/var/log/accel-ppp/emerg.log log-fail-file=/var/log/accel-ppp/auth-fail.log #log-debug=/dev/stdout -#syslog=accel-pppd,daemon #log-tcp=127.0.0.1:3000 copy=1 #color=1 @@ -117,6 +115,7 @@ copy=1 #per-session-dir=per_session #per-session=1 level=3 +#log-tcp=127.0.0.1:3000 [log-pgsql] conninfo=user=log diff --git a/accel-pppd/accel-ppp.conf.5 b/accel-pppd/accel-ppp.conf.5 index 955f167..4e15afb 100644 --- a/accel-pppd/accel-ppp.conf.5 +++ b/accel-pppd/accel-ppp.conf.5 @@ -363,10 +363,6 @@ Path to file to write authentication failed session log. .BI "log-tcp=" x.x.x.x:port Send logs to specified host. .TP -.BI "syslog=" ident[,facility] -Send logs to system logger. -Facility may be: daemon, local0-local7 or numeric value. -.TP .BI "copy=" n If this options is given and greater then zero logging engine will duplicate session log in general log. (Useful when per-session/per-user logs are not used) diff --git a/accel-pppd/logs/CMakeLists.txt b/accel-pppd/logs/CMakeLists.txt index b10163f..ce909b6 100644 --- a/accel-pppd/logs/CMakeLists.txt +++ b/accel-pppd/logs/CMakeLists.txt @@ -1,37 +1,11 @@ -IF(NOT DEFINED LOG_FILE) - SET(LOG_FILE TRUE) -ENDIF(NOT DEFINED LOG_FILE) +ADD_LIBRARY(log_file SHARED log_file.c) +TARGET_LINK_LIBRARIES(log_file rt) -IF(NOT DEFINED LOG_TCP) - SET(LOG_TCP TRUE) -ENDIF(NOT DEFINED LOG_TCP) +ADD_LIBRARY(log_tcp SHARED log_tcp.c) -IF(NOT DEFINED LOG_SYSLOG) - SET(LOG_SYSLOG TRUE) -ENDIF(NOT DEFINED LOG_SYSLOG) - - -IF(LOG_FILE) - ADD_LIBRARY(log_file SHARED log_file.c) - TARGET_LINK_LIBRARIES(log_file rt) - INSTALL(TARGETS log_file - LIBRARY DESTINATION lib/accel-ppp - ) -ENDIF(LOG_FILE) - -IF(LOG_TCP) - ADD_LIBRARY(log_tcp SHARED log_tcp.c) - INSTALL(TARGETS log_tcp - LIBRARY DESTINATION lib/accel-ppp - ) -ENDIF(LOG_TCP) - -IF(LOG_SYSLOG) - ADD_LIBRARY(log_syslog SHARED log_syslog.c) - INSTALL(TARGETS log_syslog - LIBRARY DESTINATION lib/accel-ppp - ) -ENDIF(LOG_SYSLOG) +INSTALL(TARGETS log_file log_tcp + LIBRARY DESTINATION lib/accel-ppp +) IF(LOG_PGSQL) ADD_LIBRARY(log_pgsql SHARED log_pgsql.c) diff --git a/accel-pppd/triton/triton.c b/accel-pppd/triton/triton.c index 4e3e75a..97c277a 100644 --- a/accel-pppd/triton/triton.c +++ b/accel-pppd/triton/triton.c @@ -171,7 +171,6 @@ cont: if (thread->ctx->need_free) { log_debug2("- context %p removed\n", thread->ctx); - thread->ctx->ud->tpd = NULL; mempool_free(thread->ctx); } |