1 files changed, 6 insertions, 2 deletions

diff --git a/src/sp_utils.c b/src/sp_utils.c
index 5ddf0b9..0f87f17 100644
--- a/src/sp_utils.c
+++ b/src/sp_utils.c
@@ -15,13 +15,17 @@ void sp_log_msg(char const* feature, int type, const char* fmt, ...) {
   vspprintf(&msg, 0, fmt, args);
   va_end(args);
 
+  const char *client_ip = getenv("REMOTE_ADDR");
+  if (!client_ip) {
+    client_ip = "0.0.0.0";
+  }
   switch (SNUFFLEUPAGUS_G(config).log_media) {
     case SP_SYSLOG:
       openlog(PHP_SNUFFLEUPAGUS_EXTNAME, LOG_PID, LOG_AUTH);
       const char* error_filename = zend_get_executed_filename();
       int syslog_level = SP_LOG_DROP ? LOG_ERR : LOG_INFO;
       int error_lineno = zend_get_executed_lineno(TSRMLS_C);
-      syslog(syslog_level, "[%s] %s in %s on line %d", feature, msg,
+      syslog(syslog_level, "[snuffleupagus][%s][%s] %s in %s on line %d", client_ip, feature, msg,
              error_filename, error_lineno);
       closelog();
       if (type == SP_LOG_DROP) {
@@ -30,7 +34,7 @@ void sp_log_msg(char const* feature, int type, const char* fmt, ...) {
       break;
     case SP_ZEND:
     default:
-      zend_error(type, "[snuffleupagus][%s] %s", feature, msg);
+      zend_error(type, "[snuffleupagus][%s][%s] %s", client_ip, feature, msg);
       break;
   }
 }