Add log_level option to filter output logs

base/pref-new.yml

@@ -80,6 +80,7 @@ server:
   port: 25500
 
 advanced:
+  log_level: info
   print_debug_info: false
   max_pending_connections: 10240
   max_concurrent_threads: 2

base/pref.ini

@@ -166,6 +166,7 @@ listen=0.0.0.0
 port=25500
 
 [advanced]
+log_level=info
 print_debug_info=false
 max_pending_connections=10240
 max_concurrent_threads=2

src/interfaces.cpp

@@ -15,6 +15,7 @@
 #include "subexport.h"
 #include "multithread.h"
 #include "logger.h"
+#include "string_hash.h"
 
 //common settings
 std::string pref_path = "pref.ini";
@@ -26,6 +27,7 @@ bool api_mode = true, write_managed_config = false, enable_rule_generator = true
 bool print_debug_info = false, cfw_child_process = false, append_userinfo = true, enable_base_gen = false;
 std::string access_token;
 extern std::string custom_group;
+extern int global_log_level;
 
 //generator settings
 bool generator_mode = false;
@@ -342,14 +344,16 @@ void refreshRulesets(string_array &ruleset_list, std::vector<ruleset_content> &r
         rule_url = trim(x.substr(x.find(",") + 1));
         if(rule_url.find("[]") == 0)
         {
-            std::cerr<<"Adding rule '"<<rule_url.substr(2)<<","<<rule_group<<"'."<<std::endl;
+            writeLog(0, "Adding rule '" + rule_url.substr(2) + "," + rule_group + "'.", LOG_LEVEL_INFO);
+            //std::cerr<<"Adding rule '"<<rule_url.substr(2)<<","<<rule_group<<"'."<<std::endl;
             rc = {rule_group, "", rule_url};
             rca.emplace_back(rc);
             continue;
         }
         else
         {
-            std::cerr<<"Updating ruleset url '"<<rule_url<<"' with group '"<<rule_group<<"'."<<std::endl;
+            //std::cerr<<"Updating ruleset url '"<<rule_url<<"' with group '"<<rule_group<<"'."<<std::endl;
+            writeLog(0, "Updating ruleset url '" + rule_url + "' with group '" + rule_group + "'.", LOG_LEVEL_INFO);
             if(fileExist(rule_url))
             {
                 rc = {rule_group, rule_url, fileGet(rule_url)};
@@ -364,7 +368,8 @@ void refreshRulesets(string_array &ruleset_list, std::vector<ruleset_content> &r
         if(rc.rule_content.size())
             rca.emplace_back(rc);
         else
-            std::cerr<<"Warning: No data was fetched from this link. Skipping..."<<std::endl;
+            //std::cerr<<"Warning: No data was fetched from this link. Skipping..."<<std::endl;
+            writeLog(0, "Warning: No data was fetched from ruleset '" + rule_url + "'. Skipping...", LOG_LEVEL_WARNING);
     }
 }
 
@@ -503,7 +508,34 @@ void readYAMLConf(YAML::Node &node)
 
     if(node["advanced"].IsDefined())
     {
+        std::string log_level;
+        node["advanced"]["log_level"] >> log_level;
         node["advanced"]["print_debug_info"] >> print_debug_info;
+        if(print_debug_info)
+            global_log_level = LOG_LEVEL_VERBOSE;
+        else
+        {
+            switch(hash_(log_level))
+            {
+            case "warn"_hash:
+                global_log_level = LOG_LEVEL_WARNING;
+                break;
+            case "error"_hash:
+                global_log_level = LOG_LEVEL_ERROR;
+                break;
+            case "fatal"_hash:
+                global_log_level = LOG_LEVEL_FATAL;
+                break;
+            case "verbose"_hash:
+                global_log_level = LOG_LEVEL_VERBOSE;
+                break;
+            case "debug"_hash:
+                global_log_level = LOG_LEVEL_DEBUG;
+                break;
+            default:
+                global_log_level = LOG_LEVEL_INFO;
+            }
+        }
         node["advanced"]["max_pending_connections"] >> max_pending_connections;
         node["advanced"]["max_concurrent_threads"] >> max_concurrent_threads;
         node["advanced"]["enable_base_gen"] >> enable_base_gen;
@@ -524,7 +556,8 @@ void readYAMLConf(YAML::Node &node)
 void readConf()
 {
     guarded_mutex guard(on_configuring);
-    std::cerr<<"Reading preference settings..."<<std::endl;
+    //std::cerr<<"Reading preference settings..."<<std::endl;
+    writeLog(0, "Reading preference settings...", LOG_LEVEL_INFO);
 
     eraseElements(def_exclude_remarks);
     eraseElements(def_include_remarks);
@@ -548,7 +581,8 @@ void readConf()
     int retVal = ini.ParseFile(pref_path);
     if(retVal != INIREADER_EXCEPTION_NONE)
     {
-        std::cerr<<"Unable to load preference settings. Reason: "<<ini.GetLastError()<<"\n";
+        //std::cerr<<"Unable to load preference settings. Reason: "<<ini.GetLastError()<<"\n";
+        writeLog(0, "Unable to load preference settings. Reason: " + ini.GetLastError(), LOG_LEVEL_FATAL);
         return;
     }
 
@@ -699,8 +733,36 @@ void readConf()
         listen_port = ini.GetInt("port");
 
     ini.EnterSection("advanced");
+    std::string log_level;
+    if(ini.ItemExist("log_level"))
+        log_level = ini.Get("log_level");
     if(ini.ItemExist("print_debug_info"))
         print_debug_info = ini.GetBool("print_debug_info");
+    if(print_debug_info)
+        global_log_level = LOG_LEVEL_VERBOSE;
+    else
+    {
+        switch(hash_(log_level))
+        {
+        case "warn"_hash:
+            global_log_level = LOG_LEVEL_WARNING;
+            break;
+        case "error"_hash:
+            global_log_level = LOG_LEVEL_ERROR;
+            break;
+        case "fatal"_hash:
+            global_log_level = LOG_LEVEL_FATAL;
+            break;
+        case "verbose"_hash:
+            global_log_level = LOG_LEVEL_VERBOSE;
+            break;
+        case "debug"_hash:
+            global_log_level = LOG_LEVEL_DEBUG;
+            break;
+        default:
+            global_log_level = LOG_LEVEL_INFO;
+        }
+    }
     if(ini.ItemExist("max_pending_connections"))
         max_pending_connections = ini.GetInt("max_pending_connections");
     if(ini.ItemExist("max_concurrent_threads"))
@@ -722,7 +784,8 @@ void readConf()
             cache_subscription = cache_config = cache_ruleset = 0; //disable cache
     }
 
-    std::cerr<<"Read preference settings completed."<<std::endl;
+    //std::cerr<<"Read preference settings completed."<<std::endl;
+    writeLog(0, "Read preference settings completed.", LOG_LEVEL_INFO);
 }
 
 struct ExternalConfig
@@ -808,7 +871,8 @@ int loadExternalConfig(std::string &path, ExternalConfig &ext)
     ini.SetIsolatedItemsSection("custom");
     if(ini.Parse(base_content) != INIREADER_EXCEPTION_NONE)
     {
-        std::cerr<<"Load external configuration failed. Reason: "<<ini.GetLastError()<<"\n";
+        //std::cerr<<"Load external configuration failed. Reason: "<<ini.GetLastError()<<"\n";
+        writeLog(0, "Load external configuration failed. Reason: " + ini.GetLastError(), LOG_LEVEL_ERROR);
         return -1;
     }
 
@@ -867,7 +931,8 @@ void generateBase()
     if(!enable_base_gen)
         return;
     std::string base_content;
-    std::cerr<<"Generating base content for Clash/R...\n";
+    //std::cerr<<"Generating base content for Clash/R...\n";
+    writeLog(0, "Generating base content for Clash/R...", LOG_LEVEL_INFO);
     if(fileExist(clash_rule_base))
         base_content = fileGet(clash_rule_base);
     else
@@ -879,7 +944,8 @@ void generateBase()
     }
     catch (YAML::Exception &e)
     {
-        std::cerr<<"Unable to load Clash base content. Reason: "<<e.msg<<"\n";
+        //std::cerr<<"Unable to load Clash base content. Reason: "<<e.msg<<"\n";
+        writeLog(0, "Unable to load Clash base content. Reason: " + e.msg, LOG_LEVEL_ERROR);
     }
     // mellow base generate removed for now
     /*
@@ -981,7 +1047,8 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
     //load external configuration
     if(config.size())
     {
-        std::cerr<<"External configuration file provided. Loading...\n";
+        //std::cerr<<"External configuration file provided. Loading...\n";
+        writeLog(0, "External configuration file provided. Loading...", LOG_LEVEL_INFO);
         //read predefined data first
         extra_group = clash_extra_group;
         extra_ruleset = rulesets;
@@ -1091,7 +1158,8 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
     for(std::string &x : urls)
     {
         x = trim(x);
-        std::cerr<<"Fetching node data from url '"<<x<<"'."<<std::endl;
+        //std::cerr<<"Fetching node data from url '"<<x<<"'."<<std::endl;
+        writeLog(0, "Fetching node data from url '" + x + "'.", LOG_LEVEL_INFO);
         if(addNodes(x, nodes, groupID, proxy, exclude_remarks, include_remarks, stream_temp, time_temp, subInfo, authorized) == -1)
         {
             *status_code = 400;
@@ -1117,10 +1185,11 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
     string_array dummy_group;
     std::vector<ruleset_content> dummy_ruleset;
 
-    std::cerr<<"Generate target: ";
+    //std::cerr<<"Generate target: ";
     if(target == "clash" || target == "clashr")
     {
-        std::cerr<<"Clash"<<((target == "clashr") ? "R" : "")<<std::endl;
+        //std::cerr<<"Clash"<<((target == "clashr") ? "R" : "")<<std::endl;
+        writeLog(0, target == "clashr" ? "Generate target: ClashR" : "Generate target: Clash", LOG_LEVEL_INFO);
         if(ext.nodelist)
         {
             YAML::Node yamlnode;
@@ -1149,7 +1218,8 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
     else if(target == "surge")
     {
         int surge_ver = version.size() ? to_int(version, 3) : 3;
-        std::cerr<<"Surge "<<surge_ver<<std::endl;
+        //std::cerr<<"Surge "<<surge_ver<<std::endl;
+        writeLog(0, "Generate target: Surge " + std::to_string(surge_ver), LOG_LEVEL_INFO);
 
         if(ext.nodelist)
         {
@@ -1173,7 +1243,8 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
     }
     else if(target == "surfboard")
     {
-        std::cerr<<"Surfboard"<<std::endl;
+        //std::cerr<<"Surfboard"<<std::endl;
+        writeLog(0, "Generate target: Surfboard", LOG_LEVEL_INFO);
         if(fileExist(ext_surfboard_base))
             base_content = fileGet(ext_surfboard_base);
         else
@@ -1189,7 +1260,8 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
     }
     else if(target == "mellow")
     {
-        std::cerr<<"Mellow"<<std::endl;
+        //std::cerr<<"Mellow"<<std::endl;
+        writeLog(0, "Generate target: Mellow", LOG_LEVEL_INFO);
         // mellow base generator removed for now
         //if(ruleset_updated || update_ruleset_on_request || ext_mellow_base != mellow_rule_base || !enable_base_gen)
         {
@@ -1215,7 +1287,8 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
     }
     else if(target == "ss")
     {
-        std::cerr<<"SS"<<std::endl;
+        //std::cerr<<"SS"<<std::endl;
+        writeLog(0, "Generate target: SS", LOG_LEVEL_INFO);
         output_content = netchToSS(nodes, ext);
         if(upload == "true")
             uploadGist("ss", upload_path, output_content, false);
@@ -1223,28 +1296,32 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
     }
     else if(target == "sssub")
     {
-        std::cerr<<"SS Subscription"<<std::endl;
+        //std::cerr<<"SS Subscription"<<std::endl;
+        writeLog(0, "Generate target: SS Subscription", LOG_LEVEL_INFO);
         output_content = netchToSSSub(nodes, ext);
         if(upload == "true")
             uploadGist("sssub", upload_path, output_content, false);
     }
     else if(target == "ssr")
     {
-        std::cerr<<"SSR"<<std::endl;
+        //std::cerr<<"SSR"<<std::endl;
+        writeLog(0, "Generate target: SSR", LOG_LEVEL_INFO);
         output_content = netchToSSR(nodes, ext);
         if(upload == "true")
             uploadGist("ssr", upload_path, output_content, false);
     }
     else if(target == "v2ray")
     {
-        std::cerr<<"v2rayN"<<std::endl;
+        //std::cerr<<"v2rayN"<<std::endl;
+        writeLog(0, "Generate target: v2rayN", LOG_LEVEL_INFO);
         output_content = netchToVMess(nodes, ext);
         if(upload == "true")
             uploadGist("v2ray", upload_path, output_content, false);
     }
     else if(target == "quan")
     {
-        std::cerr<<"Quantumult"<<std::endl;
+        //std::cerr<<"Quantumult"<<std::endl;
+        writeLog(0, "Generate target: Quantumult", LOG_LEVEL_INFO);
         if(!ext.nodelist)
         {
             if(fileExist(ext_quan_base))
@@ -1260,7 +1337,8 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
     }
     else if(target == "quanx")
     {
-        std::cerr<<"Quantumult X"<<std::endl;
+        //std::cerr<<"Quantumult X"<<std::endl;
+        writeLog(0, "Generate target: Quantumult X", LOG_LEVEL_INFO);
         if(!ext.nodelist)
         {
             if(fileExist(ext_quanx_base))
@@ -1276,7 +1354,8 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
     }
     else if(target == "loon")
     {
-        std::cerr<<"Loon"<<std::endl;
+        //std::cerr<<"Loon"<<std::endl;
+        writeLog(0, "Generate target: Loon", LOG_LEVEL_INFO);
         if(!ext.nodelist)
         {
             if(fileExist(ext_loon_base))
@@ -1292,17 +1371,20 @@ std::string subconverter(RESPONSE_CALLBACK_ARGS)
     }
     else if(target == "ssd")
     {
-        std::cerr<<"SSD"<<std::endl;
+        //std::cerr<<"SSD"<<std::endl;
+        writeLog(0, "Generate target: SSD", LOG_LEVEL_INFO);
         output_content = netchToSSD(nodes, group, subInfo, ext);
         if(upload == "true")
             uploadGist("ssd", upload_path, output_content, false);
     }
     else
     {
-        std::cerr<<"Unspecified"<<std::endl;
+        //std::cerr<<"Unspecified"<<std::endl;
+        writeLog(0, "Generate target: Unspecified", LOG_LEVEL_INFO);
         *status_code = 500;
         return "Unrecognized target";
     }
+    writeLog(0, "Generate completed.", LOG_LEVEL_INFO);
     if(filename.size())
         extra_headers.emplace("Content-Disposition", "attachment; filename=\"" + filename + "\"");
     return output_content;
@@ -1360,7 +1442,8 @@ std::string simpleToClashR(RESPONSE_CALLBACK_ARGS)
     for(std::string &x : urls)
     {
         x = trim(x);
-        std::cerr<<"Fetching node data from url '"<<x<<"'."<<std::endl;
+        //std::cerr<<"Fetching node data from url '"<<x<<"'."<<std::endl;
+        writeLog(0, "Fetching node data from url '" + x + "'.", LOG_LEVEL_INFO);
         if(addNodes(x, nodes, groupID, proxy, exclude_remarks, include_remarks, dummy, dummy, subInfo, false) == -1)
         {
             *status_code = 400;
@@ -1420,14 +1503,16 @@ std::string surgeConfToClash(RESPONSE_CALLBACK_ARGS)
     if(ini.Parse(base_content) != INIREADER_EXCEPTION_NONE)
     {
         std::string errmsg = "Parsing Surge config failed! Reason: " + ini.GetLastError();
-        std::cerr<<errmsg<<"\n";
+        //std::cerr<<errmsg<<"\n";
+        writeLog(0, errmsg, LOG_LEVEL_ERROR);
         *status_code = 400;
         return errmsg;
     }
     if(!ini.SectionExist("Proxy") || !ini.SectionExist("Proxy Group") || !ini.SectionExist("Rule"))
     {
         std::string errmsg = "Incomplete surge config! Missing critical sections!";
-        std::cerr<<errmsg<<"\n";
+        //std::cerr<<errmsg<<"\n";
+        writeLog(0, errmsg, LOG_LEVEL_ERROR);
         *status_code = 400;
         return errmsg;
     }
@@ -1476,7 +1561,8 @@ std::string surgeConfToClash(RESPONSE_CALLBACK_ARGS)
     std::string subInfo;
     for(std::string &x : links)
     {
-        std::cerr<<"Fetching node data from url '"<<x<<"'."<<std::endl;
+        //std::cerr<<"Fetching node data from url '"<<x<<"'."<<std::endl;
+        writeLog(0, "Fetching node data from url '" + x + "'.", LOG_LEVEL_INFO);
         if(addNodes(x, nodes, 0, proxy, dummy_str_array, dummy_str_array, dummy_str_array, dummy_str_array, subInfo, false) == -1)
         {
             *status_code = 400;
@@ -1586,20 +1672,24 @@ std::string getProfile(RESPONSE_CALLBACK_ARGS)
         *status_code = 404;
         return "Profile not found";
     }
-    std::cerr<<"Trying to load profile '" + name + "'.\n";
+    //std::cerr<<"Trying to load profile '" + name + "'.\n";
+    writeLog(0, "Trying to load profile '" + name + "'.", LOG_LEVEL_INFO);
     INIReader ini;
     if(ini.ParseFile(name) != INIREADER_EXCEPTION_NONE && !ini.SectionExist("Profile"))
     {
-        std::cerr<<"Load profile failed! Reason: "<<ini.GetLastError()<<"\n";
+        //std::cerr<<"Load profile failed! Reason: "<<ini.GetLastError()<<"\n";
+        writeLog(0, "Load profile failed! Reason: " + ini.GetLastError(), LOG_LEVEL_ERROR);
         *status_code = 500;
         return "Broken profile!";
     }
-    std::cerr<<"Trying to parse profile '" + name + "'.\n";
+    //std::cerr<<"Trying to parse profile '" + name + "'.\n";
+    writeLog(0, "Trying to parse profile '" + name + "'.", LOG_LEVEL_INFO);
     string_multimap contents;
     ini.GetItems("Profile", contents);
     if(!contents.size())
     {
-        std::cerr<<"Load profile failed! Reason: Empty Profile section\n";
+        //std::cerr<<"Load profile failed! Reason: Empty Profile section\n";
+        writeLog(0, "Load profile failed! Reason: Empty Profile section", LOG_LEVEL_ERROR);
         *status_code = 500;
         return "Broken profile!";
     }
@@ -1761,26 +1851,31 @@ std::string subInfoToMessage(std::string subinfo)
 
 int simpleGenerator()
 {
-    std::cerr<<"\nReading generator configuration...\n";
+    //std::cerr<<"\nReading generator configuration...\n";
+    writeLog(0, "Reading generator configuration...", LOG_LEVEL_INFO);
     std::string config = fileGet("generate.ini"), path, profile, arguments, content;
     if(config.empty())
     {
-        std::cerr<<"Generator configuration not found or empty!\n";
+        //std::cerr<<"Generator configuration not found or empty!\n";
+        writeLog(0, "Generator configuration not found or empty!", LOG_LEVEL_ERROR);
         return -1;
     }
 
     INIReader ini;
     if(ini.Parse(config) != INIREADER_EXCEPTION_NONE)
     {
-        std::cerr<<"Generator configuration broken! Reason:"<<ini.GetLastError()<<"\n";
+        //std::cerr<<"Generator configuration broken! Reason:"<<ini.GetLastError()<<"\n";
+        writeLog(0, "Generator configuration broken! Reason:" + ini.GetLastError(), LOG_LEVEL_ERROR);
         return -2;
     }
-    std::cerr<<"Read generator configuration completed.\n\n";
+    //std::cerr<<"Read generator configuration completed.\n\n";
+    writeLog(0, "Read generator configuration completed.\n", LOG_LEVEL_INFO);
 
     string_array sections = ini.GetSections();
     if(gen_profile.size())
     {
-        std::cerr<<"Generating with specific artifacts: \""<<gen_profile<<"\"...\n";
+        //std::cerr<<"Generating with specific artifacts: \""<<gen_profile<<"\"...\n";
+        writeLog(0, "Generating with specific artifacts: \"" + gen_profile + "\"...", LOG_LEVEL_INFO);
         string_array targets = split(gen_profile, ","), new_targets;
         for(std::string &x : targets)
         {
@@ -1789,7 +1884,8 @@ int simpleGenerator()
                 new_targets.emplace_back(x);
             else
             {
-                std::cerr<<"Artifact \""<<x<<"\" not found in generator settings!\n";
+                //std::cerr<<"Artifact \""<<x<<"\" not found in generator settings!\n";
+                writeLog(0, "Artifact \"" + x + "\" not found in generator settings!", LOG_LEVEL_ERROR);
                 return -3;
             }
         }
@@ -1797,7 +1893,8 @@ int simpleGenerator()
         sections.shrink_to_fit();
     }
     else
-        std::cerr<<"Generating all artifacts...\n";
+        //std::cerr<<"Generating all artifacts...\n";
+        writeLog(0, "Generating all artifacts...", LOG_LEVEL_INFO);
 
     string_multimap allItems;
     std::string dummy_str;
@@ -1807,13 +1904,15 @@ int simpleGenerator()
     {
         arguments.clear();
         ret_code = 200;
-        std::cerr<<"Generating artifact '"<<x<<"'...\n";
+        //std::cerr<<"Generating artifact '"<<x<<"'...\n";
+        writeLog(0, "Generating artifact '" + x + "'...", LOG_LEVEL_INFO);
         ini.EnterSection(x);
         if(ini.ItemExist("path"))
             path = ini.Get("path");
         else
         {
-            std::cerr<<"Artifact '"<<x<<"' output path missing! Skipping...\n\n";
+            //std::cerr<<"Artifact '"<<x<<"' output path missing! Skipping...\n\n";
+            writeLog(0, "Artifact '" + x + "' output path missing! Skipping...\n", LOG_LEVEL_ERROR);
             continue;
         }
         if(ini.ItemExist("profile"))
@@ -1842,7 +1941,8 @@ int simpleGenerator()
                 }
                 if(content.empty())
                 {
-                    std::cerr<<"Artifact '"<<x<<"' generate ERROR! Please check your link.\n\n";
+                    //std::cerr<<"Artifact '"<<x<<"' generate ERROR! Please check your link.\n\n";
+                    writeLog(0, "Artifact '" + x + "' generate ERROR! Please check your link.\n", LOG_LEVEL_ERROR);
                     if(sections.size() == 1)
                         return -1;
                 }
@@ -1863,7 +1963,8 @@ int simpleGenerator()
         }
         if(ret_code != 200)
         {
-            std::cerr<<"Artifact '"<<x<<"' generate ERROR! Reason: "<<content<<"\n\n";
+            //std::cerr<<"Artifact '"<<x<<"' generate ERROR! Reason: "<<content<<"\n\n";
+            writeLog(0, "Artifact '" + x + "' generate ERROR! Reason: " + content + "\n", LOG_LEVEL_ERROR);
             if(sections.size() == 1)
                 return -1;
             continue;
@@ -1877,9 +1978,11 @@ int simpleGenerator()
                 break;
             }
         }
-        std::cerr<<"Artifact '"<<x<<"' generate SUCCESS!\n\n";
+        //std::cerr<<"Artifact '"<<x<<"' generate SUCCESS!\n\n";
+        writeLog(0, "Artifact '" + x + "' generate SUCCESS!\n", LOG_LEVEL_INFO);
         eraseElements(headers);
     }
-    std::cerr<<"All artifact generated. Exiting...\n";
+    //std::cerr<<"All artifact generated. Exiting...\n";
+    writeLog(0, "All artifact generated. Exiting...", LOG_LEVEL_INFO);
     return 0;
 }

src/logger.cpp

@@ -5,6 +5,7 @@
 #include "logger.h"
 
 extern bool print_debug_info;
+int global_log_level = LOG_LEVEL_INFO;
 
 std::string getTime(int type)
 {
@@ -32,9 +33,34 @@ std::string getTime(int type)
     return std::string(tmpbuf);
 }
 
-void writeLog(int type, std::string content)
+void writeLog(int type, std::string content, int level)
 {
     //placeholder
+    /*
     if(print_debug_info)
         std::cerr<<getTime(2)<<" [DEBUG] "<<content<<"\n";
+    */
+    if(level > global_log_level)
+        return;
+    switch(level)
+    {
+    case LOG_LEVEL_VERBOSE:
+        std::cerr<<getTime(2)<<" [VERBOSE] "<<content<<"\n";
+        break;
+    case LOG_LEVEL_DEBUG:
+        std::cerr<<getTime(2)<<" [DEBUG] "<<content<<"\n";
+        break;
+    case LOG_LEVEL_INFO:
+        std::cerr<<getTime(2)<<" [INFO] "<<content<<"\n";
+        break;
+    case LOG_LEVEL_WARNING:
+        std::cerr<<getTime(2)<<" [WARNING] "<<content<<"\n";
+        break;
+    case LOG_LEVEL_ERROR:
+        std::cerr<<getTime(2)<<" [ERROR] "<<content<<"\n";
+        break;
+    case LOG_LEVEL_FATAL:
+        std::cerr<<getTime(2)<<" [FATAL] "<<content<<"\n";
+        break;
+    }
 }

src/logger.h

@@ -5,17 +5,30 @@
 
 #include "misc.h"
 
-#define LOG_TYPE_INFO 1
+enum
-#define LOG_TYPE_ERROR 2
+{
-#define LOG_TYPE_RAW 3
+    LOG_TYPE_INFO,
-#define LOG_TYPE_WARN 4
+    LOG_TYPE_ERROR,
-#define LOG_TYPE_TCPING 5
+    LOG_TYPE_RAW,
-#define LOG_TYPE_FILEDL 6
+    LOG_TYPE_WARN,
-#define LOG_TYPE_GEOIP 7
+    LOG_TYPE_TCPING,
-#define LOG_TYPE_RULES 8
+    LOG_TYPE_FILEDL,
-#define LOG_TYPE_GPING 9
+    LOG_TYPE_GEOIP,
-#define LOG_TYPE_RENDER 10
+    LOG_TYPE_RULES,
-#define LOG_TYPE_FILEUL 11
+    LOG_TYPE_GPING,
+    LOG_TYPE_RENDER,
+    LOG_TYPE_FILEUL
+};
+
+enum
+{
+    LOG_LEVEL_FATAL,
+    LOG_LEVEL_ERROR,
+    LOG_LEVEL_WARNING,
+    LOG_LEVEL_INFO,
+    LOG_LEVEL_DEBUG,
+    LOG_LEVEL_VERBOSE
+};
 
 extern std::string resultPath, logPath;
 
@@ -23,7 +36,7 @@ int makeDir(const char *path);
 std::string getTime(int type);
 void logInit(bool rpcmode);
 void resultInit();
-void writeLog(int type, std::string content);
+void writeLog(int type, std::string content, int level = LOG_LEVEL_VERBOSE);
 void logEOF();
 
 /*

src/main.cpp

@@ -8,6 +8,7 @@
 #include "misc.h"
 #include "socket.h"
 #include "webget.h"
+#include "logger.h"
 
 extern std::string pref_path, access_token, listen_address, gen_profile;
 extern bool api_mode, generator_mode, cfw_child_process, update_ruleset_on_request;
@@ -67,7 +68,8 @@ void chkArg(int argc, char *argv[])
 
 void signal_handler(int sig)
 {
-    std::cerr<<"Interrupt signal "<<sig<<" received. Exiting gracefully...\n";
+    //std::cerr<<"Interrupt signal "<<sig<<" received. Exiting gracefully...\n";
+    writeLog(0, "Interrupt signal " + std::to_string(sig) + " received. Exiting gracefully...", LOG_LEVEL_FATAL);
     switch(sig)
     {
 #ifndef _WIN32
@@ -83,11 +85,13 @@ void signal_handler(int sig)
 
 int main(int argc, char *argv[])
 {
+    writeLog(0, "SubConverter " VERSION " starting up..", LOG_LEVEL_INFO);
 #ifdef _WIN32
     WSADATA wsaData;
     if (WSAStartup(MAKEWORD(1, 1), &wsaData) != 0)
     {
-        std::cerr<<"WSAStartup failed.\n";
+        //std::cerr<<"WSAStartup failed.\n";
+        writeLog(0, "WSAStartup failed.", LOG_LEVEL_FATAL);
         return 1;
     }
     UINT origcp = GetConsoleOutputCP();
@@ -101,7 +105,7 @@ int main(int argc, char *argv[])
     signal(SIGTERM, signal_handler);
     signal(SIGINT, signal_handler);
 
-    SetConsoleTitle("subconverter " VERSION);
+    SetConsoleTitle("SubConverter " VERSION);
 #ifndef _DEBUG
     std::string prgpath = argv[0];
     setcd(prgpath); //first switch to program directory
@@ -287,7 +291,8 @@ int main(int argc, char *argv[])
     if(env_port.size())
         listen_port = to_int(env_port, listen_port);
     listener_args args = {listen_address, listen_port, max_pending_connections, max_concurrent_threads};
-    std::cout<<"Serving HTTP @ http://"<<listen_address<<":"<<listen_port<<std::endl;
+    //std::cout<<"Serving HTTP @ http://"<<listen_address<<":"<<listen_port<<std::endl;
+    writeLog(0, "Startup completed. Serving HTTP @ http://" + listen_address + ":" + std::to_string(listen_port), LOG_LEVEL_INFO);
     start_web_server_multi(&args);
 
 #ifdef _WIN32

src/string_hash.h

@@ -8,7 +8,7 @@ typedef uint64_t hash_t;
 constexpr hash_t prime = 0x100000001B3ull;
 constexpr hash_t basis = 0xCBF29CE484222325ull;
 
-hash_t hash_(char const* str)
+inline hash_t hash_(char const* str)
 {
     hash_t ret{basis};
     while(*str)
@@ -20,7 +20,7 @@ hash_t hash_(char const* str)
     return ret;
 }
 
-hash_t hash_(const std::string &str)
+inline hash_t hash_(const std::string &str)
 {
     return hash_(str.data());
 }

src/subexport.cpp

@@ -8,6 +8,7 @@
 #include "multithread.h"
 #include "socket.h"
 #include "string_hash.h"
+#include "logger.h"
 
 #include <algorithm>
 #include <iostream>
@@ -2446,21 +2447,24 @@ int uploadGist(std::string name, std::string path, std::string content, bool wri
 
     if(!fileExist("gistconf.ini"))
     {
-        std::cerr<<"gistconf.ini not found. Skipping...\n";
+        //std::cerr<<"gistconf.ini not found. Skipping...\n";
+        writeLog(0, "gistconf.ini not found. Skipping...", LOG_LEVEL_ERROR);
         return -1;
     }
 
     ini.ParseFile("gistconf.ini");
     if(ini.EnterSection("common") != 0)
     {
-        std::cerr<<"gistconf.ini has incorrect format. Skipping...\n";
+        //std::cerr<<"gistconf.ini has incorrect format. Skipping...\n";
+        writeLog(0, "gistconf.ini has incorrect format. Skipping...", LOG_LEVEL_ERROR);
         return -1;
     }
 
     token = ini.Get("token");
     if(!token.size())
     {
-        std::cerr<<"No token is provided. Skipping...\n";
+        //std::cerr<<"No token is provided. Skipping...\n";
+        writeLog(0, "No token is provided. Skipping...", LOG_LEVEL_ERROR);
         return -1;
     }
 
@@ -2476,24 +2480,28 @@ int uploadGist(std::string name, std::string path, std::string content, bool wri
 
     if(!id.size())
     {
-        std::cerr<<"No gist id is provided. Creating new gist...\n";
+        //std::cerr<<"No gist id is provided. Creating new gist...\n";
+        writeLog(0, "No Gist id is provided. Creating new Gist...", LOG_LEVEL_ERROR);
         retVal = curlPost("https://api.github.com/gists", buildGistData(path, content), getSystemProxy(), token, &retData);
         if(retVal != 201)
         {
-            std::cerr<<"Create new Gist failed! Return data:\n"<<retData<<"\n";
+            //std::cerr<<"Create new Gist failed! Return data:\n"<<retData<<"\n";
+            writeLog(0, "Create new Gist failed! Return data:\n" + retData, LOG_LEVEL_ERROR);
             return -1;
         }
     }
     else
     {
         url = "https://gist.githubusercontent.com/" + username + "/" + id + "/raw/" + path;
-        std::cerr<<"Gist id provided. Modifying gist...\n";
+        //std::cerr<<"Gist id provided. Modifying Gist...\n";
+        writeLog(0, "Gist id provided. Modifying Gist...", LOG_LEVEL_INFO);
         if(writeManageURL)
             content = "#!MANAGED-CONFIG " + url + "\n" + content;
         retVal = curlPatch("https://api.github.com/gists/" + id, buildGistData(path, content), getSystemProxy(), token, &retData);
         if(retVal != 200)
         {
-            std::cerr<<"Modify gist failed! Return data:\n"<<retData<<"\n";
+            //std::cerr<<"Modify gist failed! Return data:\n"<<retData<<"\n";
+            writeLog(0, "Modify Gist failed! Return data:\n" + retData, LOG_LEVEL_ERROR);
             return -1;
         }
     }
@@ -2502,7 +2510,8 @@ int uploadGist(std::string name, std::string path, std::string content, bool wri
     if(json.HasMember("owner"))
         GetMember(json["owner"], "login", username);
     url = "https://gist.githubusercontent.com/" + username + "/" + id + "/raw/" + path;
-    std::cerr<<"Writing to Gist success!\nGenerator: "<<name<<"\nPath: "<<path<<"\nRaw URL: "<<url<<"\nGist owner: "<<username<<"\n";
+    //std::cerr<<"Writing to Gist success!\nGenerator: "<<name<<"\nPath: "<<path<<"\nRaw URL: "<<url<<"\nGist owner: "<<username<<"\n";
+    writeLog(0, "Writing to Gist success!\nGenerator: " + name + "\nPath: " + path + "\nRaw URL: " + url + "\nGist owner: " + username, LOG_LEVEL_INFO);
 
     ini.EraseSection();
     ini.Set("token", token);

src/webget.cpp

@@ -17,6 +17,7 @@
 #endif // _WIN32
 
 extern bool print_debug_info;
+extern int global_log_level;
 
 typedef std::lock_guard<std::mutex> guarded_mutex;
 std::mutex cache_rw_lock;
@@ -47,7 +48,7 @@ static int writer(char *data, size_t size, size_t nmemb, std::string *writerData
 static inline void curl_set_common_options(CURL *curl_handle, const char *url)
 {
     curl_easy_setopt(curl_handle, CURLOPT_URL, url);
-    curl_easy_setopt(curl_handle, CURLOPT_VERBOSE, print_debug_info ? 1L : 0L);
+    curl_easy_setopt(curl_handle, CURLOPT_VERBOSE, global_log_level == LOG_LEVEL_VERBOSE ? 1L : 0L);
     curl_easy_setopt(curl_handle, CURLOPT_NOPROGRESS, 1L);
     curl_easy_setopt(curl_handle, CURLOPT_NOSIGNAL, 1L);
     curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1L);

src/webserver_libevent.cpp

@@ -16,6 +16,7 @@
 #include "misc.h"
 #include "webserver.h"
 #include "socket.h"
+#include "logger.h"
 
 extern std::string user_agent_str;
 std::atomic_bool SERVER_EXIT_FLAG(false);
@@ -41,7 +42,8 @@ static inline void buffer_cleanup(struct evbuffer *eb)
 static inline int process_request(const char *method_str, std::string uri, std::string &postdata, std::string &content_type, std::string &return_data, int *status_code, std::map<std::string, std::string> &extra_headers)
 {
     std::string path, arguments;
-    std::cerr << "handle_cmd:    " << method_str << std::endl << "handle_uri:    " << uri << std::endl;
+    //std::cerr << "handle_cmd:    " << method_str << std::endl << "handle_uri:    " << uri << std::endl;
+    writeLog(0, "handle_cmd:    " + std::string(method_str) + " handle_uri:    " + uri, LOG_LEVEL_VERBOSE);
 
     if(strFind(uri, "?"))
     {
@@ -77,7 +79,8 @@ void OnReq(evhttp_request *req, void *args)
     char *client_ip;
     u_short client_port;
     evhttp_connection_get_peer(evhttp_request_get_connection(req), &client_ip, &client_port);
-    std::cerr<<"Accept connection from client "<<client_ip<<":"<<client_port<<"\n";
+    //std::cerr<<"Accept connection from client "<<client_ip<<":"<<client_port<<"\n";
+    writeLog(0, "Accept connection from client " + std::string(client_ip) + ":" + std::to_string(client_port), LOG_LEVEL_DEBUG);
     int retVal;
     std::string postdata, content_type, return_data;
 
@@ -154,7 +157,8 @@ int start_web_server(void *argv)
     int port = args->port;
     if (!event_init())
     {
-        std::cerr << "Failed to init libevent." << std::endl;
+        //std::cerr << "Failed to init libevent." << std::endl;
+        writeLog(0, "Failed to init libevent.", LOG_LEVEL_FATAL);
         return -1;
     }
     const char *SrvAddress = listen_address.c_str();
@@ -162,7 +166,8 @@ int start_web_server(void *argv)
     std::unique_ptr<evhttp, decltype(&evhttp_free)> Server(evhttp_start(SrvAddress, SrvPort), &evhttp_free);
     if (!Server)
     {
-        std::cerr << "Failed to init http server." << std::endl;
+        //std::cerr << "Failed to init http server." << std::endl;
+        writeLog(0, "Failed to init http server.", LOG_LEVEL_FATAL);
         return -1;
     }
 
@@ -171,7 +176,8 @@ int start_web_server(void *argv)
     evhttp_set_timeout(Server.get(), 30);
     if (event_dispatch() == -1)
     {
-        std::cerr << "Failed to run message loop." << std::endl;
+        //std::cerr << "Failed to run message loop." << std::endl;
+        writeLog(0, "Failed to run message loop.", LOG_LEVEL_FATAL);
         return -1;
     }