perf: log: use git submodule

Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>

.github/workflows/release.yml

@@ -30,7 +30,7 @@ jobs:
           version=${{ steps.get-version.outputs.version-without-v }}
           cd ..
           cp -r rtty rtty-$version
-          rm -rf rtty-$version/.git* rtty-$version/src/buffer/.git* rtty-$version/src/ssl/.git*
+          rm -rf rtty-$version/.git* rtty-$version/src/buffer/.git* rtty-$version/src/ssl/.git* rtty-$version/src/log/.git*
           tar zcfv rtty-$version.tar.gz rtty-$version
           echo "::set-output name=asset-path::../rtty-$version.tar.gz"
           echo "::set-output name=asset-name::rtty-$version.tar.gz"

.gitmodules

@@ -1,6 +1,9 @@
 [submodule "src/buffer"]
 	path = src/buffer
-	url = https://github.com/zhaojh329/buffer.git
+	url = https://gitee.com/zhaojh329/buffer.git
 [submodule "src/ssl"]
 	path = src/ssl
-	url = https://github.com/zhaojh329/ssl.git
+	url = https://gitee.com/zhaojh329/ssl.git
+[submodule "src/log"]
+	path = src/log
+	url = https://github.com/zhaojh329/log.git

src/CMakeLists.txt

@@ -7,6 +7,7 @@ set(RTTY_VERSION_PATCH 0)
 find_package(Libev REQUIRED)
 
 aux_source_directory(. SRCS)
+aux_source_directory(log SRCS)
 aux_source_directory(buffer SRCS)
 
 add_executable(rtty ${SRCS})

src/command.c

@@ -34,7 +34,7 @@
 #include <math.h>
 #include <pwd.h>
 
-#include "log.h"
+#include "log/log.h"
 #include "list.h"
 #include "utils.h"
 #include "command.h"

src/file.c

@@ -32,7 +32,7 @@
 #include <sys/statvfs.h>
 #include <linux/limits.h>
 
-#include "log.h"
+#include "log/log.h"
 #include "file.h"
 #include "list.h"
 #include "rtty.h"
@@ -143,7 +143,7 @@ static int start_upload_file(struct file_context *ctx, const char *path)
 
     fd = open(path, O_RDONLY);
     if (fd < 0) {
-        log_err("open '%s' fail\n", path, strerror(errno));
+        log_err("open '%s' fail: %s\n", path, strerror(errno));
         return -1;
     }
 
@@ -295,7 +295,7 @@ static void start_download_file(struct file_context *ctx, struct buffer *info, i
     log_info("download file: %s, size: %u\n", savepath, ctx->total_size);
 
     if (fchown(fd, ctx->uid, ctx->gid) < 0)
-        log_err("fchown %s fail: %s\n", strerror(errno));
+        log_err("fchown %s fail: %s\n", savepath, strerror(errno));
 
     if (ctx->total_size == 0)
         close(fd);

src/main.c

@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <getopt.h>
 
-#include "log.h"
+#include "log/log.h"
 #include "rtty.h"
 
 enum {
@@ -197,8 +197,8 @@ int main(int argc, char **argv)
     if (background && daemon(0, 0))
         log_err("Can't run in the background: %s\n", strerror(errno));
 
-    if (!verbose)
-        set_log_threshold(LOG_ERR);
+    if (verbose)
+        log_level(LOG_DEBUG);
 
     log_info("rtty version %s\n", RTTY_VERSION_STRING);
 

src/net.c

@@ -32,7 +32,7 @@
 
 #include "list.h"
 #include "net.h"
-#include "log.h"
+#include "log/log.h"
 
 struct net_context {
     struct ev_timer tmr;

src/rtty.c

@@ -29,13 +29,13 @@
 #include <sys/sysinfo.h>
 
 #include "net.h"
-#include "log.h"
 #include "web.h"
 #include "file.h"
 #include "rtty.h"
 #include "list.h"
 #include "utils.h"
 #include "command.h"
+#include "log/log.h"
 
 static char login_path[128];       /* /bin/login */
 

src/web.c

@@ -33,7 +33,7 @@
 
 #include "web.h"
 #include "net.h"
-#include "log.h"
+#include "log/log.h"
 
 void web_request_free(struct web_request_ctx *ctx)
 {