Merge pull request #113 from Beginner-Go/master

ttyd : update v1.6.3
This commit is contained in:
coolsnowwolf 2021-01-21 21:20:07 +08:00 committed by GitHub
commit 80e7ea5d72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 16 deletions

View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ttyd
PKG_VERSION:=1.6.0
PKG_RELEASE:=2
PKG_VERSION:=1.6.3
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/tsl0922/ttyd/tar.gz/$(PKG_VERSION)?
PKG_HASH:=d14740bc82be0d0760dd0a3c97acbcbde490412a4edc61edabe46d311b068f83
PKG_HASH:=1116419527edfe73717b71407fb6e06f46098fc8a8e6b0bb778c4c75dc9f64b9
PKG_MAINTAINER:=Shuanglei Tao <tsl0922@gmail.com>
PKG_LICENSE:=MIT

View File

@ -79,7 +79,7 @@ ttyd_instance()
${ssl_cert:+-C $ssl_cert} \
${ssl_key:+-K $ssl_key} \
${ssl_ca:+-A $ssl_ca} \
${debug:+-d}
${debug:+-d $debug}
config_list_foreach "$1" client_option "procd_append_param command -t"
procd_append_param command $command
procd_set_param stdout 1

View File

@ -1,20 +1,20 @@
--- a/src/server.c
+++ b/src/server.c
@@ -6,6 +6,7 @@
#include <getopt.h>
#include <signal.h>
@@ -10,6 +10,7 @@
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
+#include <syslog.h>
#include <libwebsockets.h>
#include <json.h>
@@ -418,7 +419,8 @@ main(int argc, char **argv) {
return -1;
}
#include "utils.h"
- lws_set_log_level(debug_level, NULL);
+ openlog("ttyd", LOG_NDELAY | LOG_PID, LOG_DAEMON);
+ lws_set_log_level(debug_level, lwsl_emit_syslog);
@@ -478,7 +479,8 @@ int main(int argc, char **argv) {
return -1;
}
- lws_set_log_level(debug_level, NULL);
+ openlog("ttyd", LOG_NDELAY | LOG_PID, LOG_DAEMON);
+ lws_set_log_level(debug_level, lwsl_emit_syslog);
#if LWS_LIBRARY_VERSION_MAJOR >= 2
char server_hdr[128] = "";
char server_hdr[128] = "";