From 1152513d14088c755d0cb85788c2f5a98eb32275 Mon Sep 17 00:00:00 2001
From: coolsnowwolf <coolsnowwolf@gmail.com>
Date: Fri, 28 Dec 2018 00:23:29 +0800
Subject: [PATCH] luci ssr plus: adjust log display

---
 package/lean/luci-app-ssr-plus/Makefile                  | 2 +-
 .../lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr  | 4 +++-
 .../root/usr/share/shadowsocksr/genv2config.lua          | 9 ++++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile
index 2453f0753..e30e4c5fd 100644
--- a/package/lean/luci-app-ssr-plus/Makefile
+++ b/package/lean/luci-app-ssr-plus/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-ssr-plus
 PKG_VERSION:=1
-PKG_RELEASE:=82
+PKG_RELEASE:=85
 
 PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks \
 	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray \
diff --git a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
index 10d6267f3..806a65e79 100755
--- a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
+++ b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
@@ -315,9 +315,11 @@ start_redir() {
     for i in $(seq 1 $threads)  
     do 
       $sscmd -c $CONFIG_FILE $ARG_OTA -f /var/run/ssr-retcp_$i.pid >/dev/null 2>&1
-    done  
+    done
+    echo "$(date "+%Y-%m-%d %H:%M:%S") Shadowsocks/ShadowsocksR $threads Threads Started!" >> /tmp/ssrplus.log  
   elif [ "$stype" == "v2ray" ] ;then
     $sscmd -config /var/etc/v2-ssr-retcp.json >/dev/null 2>&1 &
+    echo "$(date "+%Y-%m-%d %H:%M:%S") $($sscmd -version | head -1) Started!" >> /tmp/ssrplus.log
 	fi
 	
 	if [ -n "$UDP_RELAY_SERVER" ] ;then
diff --git a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config.lua b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config.lua
index 30fecc152..68d2a4d88 100644
--- a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config.lua
+++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config.lua
@@ -8,7 +8,7 @@ local server = ucursor:get_all("shadowsocksr", server_section)
 
 local v2ray = {
   log = {
-    error = "/var/ssrplus.log",
+    -- error = "/var/ssrplus.log",
     loglevel = "warning"
   },
     -- 传入连接
@@ -68,6 +68,13 @@ local v2ray = {
             httpSettings = (server.transport == "h2") and {
                 path = server.h2_path,
                 host = server.h2_host,
+            } or nil,
+            quicSettings = (server.transport == "quic") and {
+                security = server.quic_security,
+                key = server.quic_key,
+                header = {
+                  type = server.quic_guise
+                }
             } or nil
         },
         mux = {