crontab logging improvement

Author: rexdf

CommandTrayHost/configure.cpp

@@ -1878,7 +1878,7 @@ void handle_crontab(int idx)
 			if (to_start)
 			{
 				config_i_ref["enabled"] = true;
-				create_process(config_i_ref, ghJob);
+				create_process(config_i_ref, ghJob, true);
 				log_msg = "method:start started.";
 				//crontab_write_log = true;
 			}
@@ -1893,13 +1893,13 @@ void handle_crontab(int idx)
 			if (config_i_ref["enabled"] && config_i_ref["running"] && config_i_ref["en_job"])
 			{
 				disable_enable_menu(config_i_ref, ghJob);
-				log_msg = "method:kill stopped.";
+				log_msg = "method:stop killed.";
 				//crontab_write_log = true;
 			}
 			if (crontab_method == "restart")
 			{
 				config_i_ref["enabled"] = true;
-				create_process(config_i_ref, ghJob, false);
+				create_process(config_i_ref, ghJob, false, true);
 				log_msg = "method:restart done.";
 				//crontab_write_log = true;
 			}
@@ -1939,12 +1939,12 @@ void handle_crontab(int idx)
 		else
 		{
 			crontab_ref["enabled"] = false;
-			log_cron_msg = "count limited";
+			log_cron_msg = "count limited,stopped.";
 			log_count = -1;
 		}
 		if (json_object_has_member(crontab_ref, "log"))
 		{
-			crontab_log(config_i_ref, log_time_cur, log_time_next, log_msg, log_cron_msg, log_count);
+			crontab_log(crontab_ref, log_time_cur, log_time_next, config_i_ref["name"].get<std::string>().c_str(), log_msg, log_cron_msg, log_count, 0);
 		}
 	}
 	else
@@ -2248,7 +2248,8 @@ void create_process(
 	nlohmann::json& jsp, // we may update js
 	//int cmd_idx,
 	const HANDLE& ghJob,
-	bool runas_admin
+	bool runas_admin,
+	bool log_crontab
 )
 {
 	//必须先用wstring接住，不然作用域会消失
@@ -2442,6 +2443,20 @@ void create_process(
 		}
 	}
 
+	if (log_crontab)
+	{
+		auto& crontab_ref = jsp["crontab_config"];
+		const size_t buffer_len = 256;
+		char buffer[buffer_len];
+		size_t idx = 0, len;
+		printf_to_bufferA(buffer, buffer_len - idx, idx,
+			"si.wShowWindow:%s start_show:%s",
+			si.wShowWindow == SW_SHOW ? "SW_SHOW" : "SW_HIDE",
+			start_show ? "true" : "false"
+		);
+		crontab_log(crontab_ref, 0, 0, jsp["name"].get<std::string>().c_str(), buffer, "", 0, 1);
+	}
+
 	// https://stackoverflow.com/questions/53208/how-do-i-automatically-destroy-child-processes-in-windows
 	// Launch child process - example is notepad.exe
 	if (false == require_admin && CreateProcess(NULL, commandLine, NULL, NULL, FALSE, CREATE_NEW_CONSOLE | CREATE_BREAKAWAY_FROM_JOB, NULL, working_directory, &si, &pi))
@@ -2891,7 +2906,7 @@ BOOL IsMyProgramRegisteredForStartup(PCWSTR pszAppName)
 		lResult = RegGetValue(hKey, NULL, pszAppName, RRF_RT_REG_SZ, &dwRegType, szPathToExe_reg, &dwSize);
 #endif
 		fSuccess = (lResult == ERROR_SUCCESS);
-	}
+}
 
 	if (fSuccess)
 	{

CommandTrayHost/configure.h

@@ -31,7 +31,7 @@ void get_command_submenu(std::vector<HMENU>&);
 int init_global(HANDLE&, HICON&);
 bool init_cth_path();
 
-void create_process(nlohmann::json& jsp, const HANDLE&, bool runas_admin = false);
+void create_process(nlohmann::json& jsp, const HANDLE&, bool runas_admin = false, bool log_crontab = false);
 void show_hide_toggle(nlohmann::json& jsp);
 void disable_enable_menu(nlohmann::json& jsp, HANDLE, bool runas_admin = false);
 

CommandTrayHost/utils.cpp

@@ -301,39 +301,66 @@ void rotate_file(PCWSTR filename)
 	msg_prompt(L"There are too many log files, Please delete or move them elsewhere.", L"Logrotate error", MB_OK);
 }
 
-void crontab_log(const nlohmann::json& jsp,
+/*
+ * Make sure jsp has "crontab_config", before call crontab_log
+ * @param time_cur,current time.
+ * @param time_next,next schedule time. If both are 0, just output log_msg & cron_msg
+ */
+void crontab_log(const nlohmann::json& jsp_crontab_config,
 	time_t time_cur,
 	time_t time_next,
+	PCSTR name,
 	PCSTR log_msg,
 	PCSTR cron_msg,
-	int log_count
+	int log_count,
+	int log_level_limit
 )
 {
-	if (json_object_has_member(jsp, "crontab_config"))
+	//if (json_object_has_member(jsp, "crontab_config"))
 	{
-		auto& crontab_config_ref = jsp["crontab_config"];
+		//auto& crontab_config_ref = jsp["crontab_config"];
+		int log_level = jsp_crontab_config["log_level"];
+		if (log_level < log_level_limit) { return; }
 		const size_t buffer_len = 256;
 		char buffer[buffer_len];
 		size_t idx = 0, len;
 		tm t1;
+		bool is_crontab_trigger_msg = true;
+		if (time_cur == 0)
+		{
+			time_cur = time(NULL);
+			if (0 == time_next)is_crontab_trigger_msg = false;
+		}
 		localtime_s(&t1, &time_cur);
 		idx = strftime(buffer, ARRAYSIZE(buffer), "%Y-%m-%d %H:%M:%S ", &t1);
-		printf_to_bufferA(buffer, buffer_len - idx, idx,
-			"[%s] [%s] [left count: %d] [%s]",
-			jsp["name"].get<std::string>().c_str(),
-			log_msg,
-			log_count,
-			//log_count == 0 ? " infinite" : "",
-			cron_msg
-		);
-		if (time_next)
+		if (is_crontab_trigger_msg)
 		{
-			localtime_s(&t1, &time_next);
-			len = strftime(buffer + idx, ARRAYSIZE(buffer), " %Y-%m-%d %H:%M:%S ", &t1);
-			idx += len;
+			printf_to_bufferA(buffer, buffer_len - idx, idx,
+				"[%s] [%s] [left count: %d] [%s]",
+				name,
+				log_msg,
+				log_count,
+				//log_count == 0 ? " infinite" : "",
+				cron_msg
+			);
+			if (time_next)
+			{
+				localtime_s(&t1, &time_next);
+				len = strftime(buffer + idx, ARRAYSIZE(buffer), " %Y-%m-%d %H:%M:%S ", &t1);
+				idx += len;
+			}
+		}
+		else
+		{
+			printf_to_bufferA(buffer, buffer_len - idx, idx,
+				"[%s] [%s] [%s]",
+				name,
+				log_msg,
+				cron_msg
+			);
 		}
 
-		std::string crontab_log_filename = crontab_config_ref["log"];
+		std::string crontab_log_filename = jsp_crontab_config["log"];
 		std::wstring crontab_log_filename_w = utf8_to_wstring(crontab_log_filename);
 		if (TRUE == PathFileExists(crontab_log_filename_w.c_str()) && FileSize(crontab_log_filename_w.c_str()) > 1024 * 1024 * 10)
 		{

CommandTrayHost/utils.hpp

@@ -49,7 +49,7 @@ bool try_read_optional_json(const nlohmann::json& root, Type& out, PCSTR query_s
 
 //void from_json(const nlohmann::json& j, cron_expr& p);
 
-void crontab_log(const nlohmann::json& jsp, time_t, time_t, PCSTR, PCSTR, int);
+void crontab_log(const nlohmann::json& jsp_crontab_config, time_t, time_t, PCSTR, PCSTR, PCSTR, int, int);
 
 cron_expr* get_cron_expr(const nlohmann::json& jsp, cron_expr& result);
 

README.md

@@ -82,7 +82,7 @@ example configure
                 "count": 0, // times to run, 0 infinite
                 // Optional
                 "enabled": true,
-                "log": "commandtrayhost.log",
+                "log": "commandtrayhost.log", // comment out this line to disable logging
                 "log_level": 0, // log level 0 1 2
             },
         },

README.zh-cn.md

@@ -80,7 +80,7 @@ Windows命令行程序系统托盘管理工具
             "enabled": true
             // 可选
             "crontab_config": { // crontab配置
-                "crontab": "8 */2 15-16 29 2 *", // crontab语法具体参考上面8
+                "crontab": "8 */2 15-16 29 2 *", // crontab语法具体参考Linux
                 "method": "start", // 支持的有 start restart stop
                 "count": 0, // 0 表示不只限制，大于0的整数，表示运行多少次就不运行了
                 // 可选