From 11fdbd84020f3ef0f66ce63831d066fe277c6037 Mon Sep 17 00:00:00 2001
From: Andy Green <andy@warmcat.com>
Date: Wed, 5 Sep 2018 14:43:16 +0800
Subject: [PATCH] lwsws: logging: use stderr not syslog directly
systemd is completely at home using stderr logging to the journal,
without needing syslog apis.
---
lwsws/main.c | 8 ++++----
lwsws/usr-lib-systemd-system-lwsws.service | 1 -
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/lwsws/main.c b/lwsws/main.c
index 3a280763..1f0c09bf 100644
--- a/lwsws/main.c
+++ b/lwsws/main.c
@@ -211,7 +211,7 @@ int main(int argc, char **argv)
int n = 0, budget = 100, debug_level = 1024 + 7;
#ifndef _WIN32
int m;
- int status, syslog_options = LOG_PID | LOG_PERROR;
+ int status;//, syslog_options = LOG_PID | LOG_PERROR;
#endif
strcpy(config_dir, "/etc/lwsws");
@@ -281,11 +281,11 @@ int main(int argc, char **argv)
#ifndef _WIN32
/* we will only try to log things according to our debug_level */
- setlogmask(LOG_UPTO (LOG_DEBUG));
- openlog("lwsws", syslog_options, LOG_DAEMON);
+// setlogmask(LOG_UPTO (LOG_DEBUG));
+// openlog("lwsws", syslog_options, LOG_DAEMON);
#endif
- lws_set_log_level(debug_level, lwsl_emit_syslog);
+ lws_set_log_level(debug_level, NULL); // lwsl_emit_syslog);
lwsl_notice("lwsws libwebsockets web server - license CC0 + LGPL2.1\n");
lwsl_notice("(C) Copyright 2010-2018 Andy Green <andy@warmcat.com>\n");
diff --git a/lwsws/usr-lib-systemd-system-lwsws.service b/lwsws/usr-lib-systemd-system-lwsws.service
index 13041a3f..38c5012c 100644
--- a/lwsws/usr-lib-systemd-system-lwsws.service
+++ b/lwsws/usr-lib-systemd-system-lwsws.service
@@ -6,7 +6,6 @@ After=syslog.target
ExecStart=/usr/local/bin/lwsws
ExecReload=/usr/bin/kill -HUP $MAINPID
ExecStop=/usr/bin/killall lwsws
-StandardError=null
[Install]
WantedBy=multi-user.target
--
GitLab