From b90e0ecc6b0717786ae72236c37157f1b5983521 Mon Sep 17 00:00:00 2001 From: Giovanni Date: Tue, 21 Jul 2020 11:58:22 +0200 Subject: Fix #338 - added log type if type is simulation, drop or log. (#339) Co-authored-by: Giovanni Dante Grazioli --- src/sp_utils.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'src/sp_utils.c') diff --git a/src/sp_utils.c b/src/sp_utils.c index c4354b6..b9078b4 100644 --- a/src/sp_utils.c +++ b/src/sp_utils.c @@ -50,14 +50,29 @@ void sp_log_msg(char const* restrict feature, int type, va_end(args); const char* client_ip = get_ipaddr(); + const char* logtype = NULL; + switch(type) { + case SP_LOG_SIMULATION: + logtype = "simulation"; + type = E_WARNING; + break; + case SP_LOG_DROP: + logtype = "drop"; + type = E_ERROR; + break; + default: + logtype = "log"; + break; + } + switch (SNUFFLEUPAGUS_G(config).log_media) { case SP_SYSLOG: { const char* error_filename = zend_get_executed_filename(); - int syslog_level = (type == SP_LOG_DROP) ? LOG_ERR : LOG_INFO; + int syslog_level = (type == E_ERROR) ? LOG_ERR : LOG_INFO; int error_lineno = zend_get_executed_lineno(TSRMLS_C); openlog(PHP_SNUFFLEUPAGUS_EXTNAME, LOG_PID, LOG_AUTH); - syslog(syslog_level, "[snuffleupagus][%s][%s] %s in %s on line %d", - client_ip, feature, msg, error_filename, error_lineno); + syslog(syslog_level, "[snuffleupagus][%s][%s][%s] %s in %s on line %d", + client_ip, feature, logtype, msg, error_filename, error_lineno); closelog(); if (type == SP_LOG_DROP) { zend_bailout(); @@ -66,7 +81,7 @@ void sp_log_msg(char const* restrict feature, int type, } case SP_ZEND: default: - zend_error(type, "[snuffleupagus][%s][%s] %s", client_ip, feature, msg); + zend_error(type, "[snuffleupagus][%s][%s][%s] %s", client_ip, feature, logtype, msg); break; } } -- cgit v1.3