add eina_log_levels & eina_log_path to enlightenment_info

Change-Id: I42d0a3af1f34313f4c475a2659bde034917d5555

diff --git a/src/bin/e_info_client.c b/src/bin/e_info_client.c
index 8e8ad07163c5ba92339a5b77ea6e05bf5747d798..173f2f32657998415d7fa31e28f4469a24846966 100644 (file)
--- a/src/bin/e_info_client.c
+++ b/src/bin/e_info_client.c
@@ -238,6 +238,57 @@ _e_info_client_proc_topvwins_shot(int argc, char **argv)
    free(directory);
 }
 
+static void
+_e_info_client_proc_eina_log_levels(int argc, char **argv)
+{
+   EINA_SAFETY_ON_FALSE_RETURN(argc == 3);
+   EINA_SAFETY_ON_NULL_RETURN(argv[2]);
+
+   if (!_e_info_client_eldbus_message_with_args("eina_log_levels", NULL, "s", argv[2]))
+     {
+        return;
+     }
+}
+
+static void
+_e_info_client_proc_eina_log_path(int argc, char **argv)
+{
+   char fd_name[PATH_MAX];
+   int pid;
+   char cwd[PATH_MAX];
+
+   EINA_SAFETY_ON_FALSE_RETURN(argc == 3);
+   EINA_SAFETY_ON_NULL_RETURN(argv[2]);
+
+   pid = getpid();
+
+   cwd[0] = '\0';
+   if (!getcwd(cwd, sizeof(cwd)))
+     snprintf(cwd, sizeof(cwd), "/tmp");
+
+   if (!strncmp(argv[2], "console", 7))
+     snprintf(fd_name, PATH_MAX, "/proc/%d/fd/1", pid);
+   else
+     {
+        if (argv[2][0] == '/')
+          snprintf(fd_name, PATH_MAX, "%s", argv[2]);
+        else
+          {
+             if (strlen(cwd) > 0)
+               snprintf(fd_name, PATH_MAX, "%s/%s", cwd, argv[2]);
+             else
+               snprintf(fd_name, PATH_MAX, "%s", argv[2]);
+          }
+     }
+
+   printf("eina-log-path: %s\n", fd_name);
+
+   if (!_e_info_client_eldbus_message_with_args("eina_log_path", NULL, "s", fd_name))
+     {
+        return;
+     }
+}
+
 static struct
 {
    const char *option;
@@ -256,6 +307,16 @@ static struct
       "Dump top-level visible windows (default directory_path : current working directory)",
       _e_info_client_proc_topvwins_shot
    },
+   {
+      "eina_log_levels", "[mymodule1:5,mymodule2:2]",
+      "Set EINA_LOG_LEVELS in runtime",
+      _e_info_client_proc_eina_log_levels
+   },
+   {
+      "eina_log_path", "[console|file_path]",
+      "Set EINA_LOG_LEVELS in runtime",
+      _e_info_client_proc_eina_log_path
+   },
 };
 
 static void

diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c
index b05ab8595f4200a645f850a95340d1349dfdbc92..85ccb5a10813dd33ce5a116238bc8303e920f1fc 100644 (file)
--- a/src/bin/e_info_server.c
+++ b/src/bin/e_info_server.c
@@ -157,9 +157,93 @@ err:
    return reply;
 }
 
+static Eldbus_Message *
+_e_info_server_cb_eina_log_levels(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg)
+{
+   Eldbus_Message *reply = eldbus_message_method_return_new(msg);
+   const char *start = NULL;
+
+   if (!eldbus_message_arguments_get(msg, "s", &start) || !start)
+     {
+        ERR("Error getting arguments.");
+        return reply;
+     }
+
+   while (1)
+     {
+        char module_name[256];
+        char *end = NULL;
+        char *tmp = NULL;
+        int level;
+
+        end = strchr(start, ':');
+        if (!end)
+           break;
+
+        // Parse level, keep going if failed
+        level = (int)strtol((char *)(end + 1), &tmp, 10);
+        if (tmp == (end + 1))
+           goto parse_end;
+
+        // Parse name
+        strncpy(module_name, start, MIN(end - start, (sizeof module_name) - 1));
+        module_name[end - start] = '\0';
+
+                 eina_log_domain_level_set((const char*)module_name, level);
+
+parse_end:
+        start = strchr(tmp, ',');
+        if (start)
+           start++;
+        else
+           break;
+     }
+
+   return reply;
+}
+
+static Eldbus_Message *
+_e_info_server_cb_eina_log_path(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg)
+{
+   Eldbus_Message *reply = eldbus_message_method_return_new(msg);
+   const char *path = NULL;
+   static int old_stderr = -1;
+   int  log_fd = -1;
+   FILE *log_fl;
+
+   if (!eldbus_message_arguments_get(msg, "s", &path) || !path)
+     {
+        ERR("Error getting arguments.");
+        return reply;
+     }
+
+   if (old_stderr == -1)
+     old_stderr = dup(STDOUT_FILENO);
+
+   log_fl = fopen(path, "a");
+   if (!log_fl)
+     {
+        ERR("failed: open file(%s)\n", path);
+        return reply;
+     }
+
+   fflush(stderr);
+   close(STDOUT_FILENO);
+
+   setvbuf(log_fl, NULL, _IOLBF, 512);
+   log_fd = fileno(log_fl);
+
+   dup2(log_fd, STDOUT_FILENO);
+   fclose(log_fl);
+
+   return reply;
+}
+
 static const Eldbus_Method methods[] = {
    { "get_window_info", NULL, ELDBUS_ARGS({"a(usiiiiibb)", "array of ec"}), _e_info_server_cb_window_info_get, 0 },
-   { "dump_topvwins", ELDBUS_ARGS({"s", "directory"}), NULL, _e_info_server_cb_topvwins_dump, ELDBUS_METHOD_FLAG_NOREPLY },
+   { "dump_topvwins", ELDBUS_ARGS({"s", "directory"}), NULL, _e_info_server_cb_topvwins_dump, 0 },
+   { "eina_log_levels", ELDBUS_ARGS({"s", "eina log levels"}), NULL, _e_info_server_cb_eina_log_levels, 0 },
+   { "eina_log_path", ELDBUS_ARGS({"s", "eina log path"}), NULL, _e_info_server_cb_eina_log_path, 0 },
    { NULL, NULL, NULL, NULL, 0 }
 };