Changeset a88ec8d69f922fad91f61239c8a7c84f915b825c

Timestamp:

11/18/10 01:48:36 (3 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

d027731b1848a3f06462a0aa71fd9e5926e14c9a

Parents:

fb15df6218dc5b759e5ba614d8413f1d1cda2d30

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-11-18T01:48:36Z+0200

Message:

ladishd: project_name -> vgraph_name (in loader module)

Files:

• daemon/loader.c (modified) (19 diffs)

daemon/loader.c

@@ -48 +48 @@
   struct list_head  siblings;
 
-  char * project_name;
+  char * vgraph_name;
   char * app_name;
 
@@ -94 +94 @@
 void
 loader_check_line_repeat_end(
-  char * project,
+  char * vgraph_name,
   char * app_name,
   bool error,
@@ -103 +103 @@
     if (error)
     {
-      log_error_plain("%s:%s: stderr line repeated %u times", project, app_name, last_line_repeat_count);
+      log_error_plain("%s:%s: stderr line repeated %u times", vgraph_name, app_name, last_line_repeat_count);
     }
     else
     {
-      log_info("%s:%s: stdout line repeated %u times", project, app_name, last_line_repeat_count);
+      log_info("%s:%s: stdout line repeated %u times", vgraph_name, app_name, last_line_repeat_count);
     }
   }
@@ -125 +125 @@
     {
       loader_check_line_repeat_end(
-        child_ptr->project_name,
+        child_ptr->vgraph_name,
         child_ptr->app_name,
         false,
@@ -131 +131 @@
 
       loader_check_line_repeat_end(
-        child_ptr->project_name,
+        child_ptr->vgraph_name,
         child_ptr->app_name,
         true,
@@ -140 +140 @@
       list_del(&child_ptr->siblings);
 
-      free(child_ptr->project_name);
+      free(child_ptr->vgraph_name);
       free(child_ptr->app_name);
 
@@ -312 +312 @@
 void
 loader_read_child_output(
-  char * project,
+  char * vgraph_name,
   char * app_name,
   int fd,
@@ -346 +346 @@
             if (error)
             {
-              log_error_plain("%s:%s: last stderr line repeating..", project, app_name);
+              log_error_plain("%s:%s: last stderr line repeating..", vgraph_name, app_name);
             }
             else
             {
-              log_info("%s:%s: last stdout line repeating...", project, app_name);
+              log_info("%s:%s: last stdout line repeating...", vgraph_name, app_name);
             }
           }
@@ -358 +358 @@
         else
         {
-          loader_check_line_repeat_end(project, app_name, error, *last_line_repeat_count);
+          loader_check_line_repeat_end(vgraph_name, app_name, error, *last_line_repeat_count);
 
           strcpy(last_line, char_ptr);
@@ -365 +365 @@
           if (error)
           {
-            log_error_plain("%s:%s: %s", project, app_name, char_ptr);
+            log_error_plain("%s:%s: %s", vgraph_name, app_name, char_ptr);
           }
           else
           {
-            log_info("%s:%s: %s", project, app_name, char_ptr);
+            log_info("%s:%s: %s", vgraph_name, app_name, char_ptr);
           }
         }
@@ -388 +388 @@
           if (error)
           {
-            log_error_plain("%s:%s: %s " ANSI_RESET ANSI_COLOR_RED "(truncated) " ANSI_RESET, project, app_name, char_ptr);
+            log_error_plain("%s:%s: %s " ANSI_RESET ANSI_COLOR_RED "(truncated) " ANSI_RESET, vgraph_name, app_name, char_ptr);
           }
           else
           {
-            log_info("%s:%s: %s " ANSI_RESET ANSI_COLOR_RED "(truncated) " ANSI_RESET, project, app_name, char_ptr);
+            log_info("%s:%s: %s " ANSI_RESET ANSI_COLOR_RED "(truncated) " ANSI_RESET, vgraph_name, app_name, char_ptr);
           }
 
@@ -422 +422 @@
     {
       loader_read_child_output(
-        child_ptr->project_name,
+        child_ptr->vgraph_name,
         child_ptr->app_name,
         child_ptr->stdout,
@@ -432 +432 @@
 
       loader_read_child_output(
-        child_ptr->project_name,
+        child_ptr->vgraph_name,
         child_ptr->app_name,
         child_ptr->stderr,
@@ -453 +453 @@
 bool
 loader_execute(
-  const char * project_name,
+  const char * vgraph_name,
   const char * app_name,
   const char * working_dir,
@@ -471 +471 @@
   }
 
-  child_ptr->project_name = strdup(project_name);
-  if (child_ptr->project_name == NULL)
-  {
-    log_error("strdup() failed to duplicate project name '%s'", project_name);
+  child_ptr->vgraph_name = strdup(vgraph_name);
+  if (child_ptr->vgraph_name == NULL)
+  {
+    log_error("strdup() failed to duplicate vgraph name '%s'", vgraph_name);
     goto free_struct;
   }
@@ -482 +482 @@
   {
     log_error("strdup() failed to duplicate app name '%s'", app_name);
-    goto free_project_name;
+    goto free_vgraph_name;
   }
 
@@ -527 +527 @@
   if (pid == -1)
   {
-    log_error("Could not fork to exec program %s:%s: %s", project_name, app_name, strerror(errno));
+    log_error("Could not fork to exec program %s:%s: %s", vgraph_name, app_name, strerror(errno));
     list_del(&child_ptr->siblings); /* fork failed so it is not really a child process to watch for. */
     return false;
@@ -574 +574 @@
   }
 
-  log_info("Forked to run program %s:%s pid = %llu", project_name, app_name, (unsigned long long)pid);
+  log_info("Forked to run program %s:%s pid = %llu", vgraph_name, app_name, (unsigned long long)pid);
 
   *pid_ptr = child_ptr->pid = pid;
@@ -580 +580 @@
   return true;
 
-free_project_name:
-  free(child_ptr->project_name);
+free_vgraph_name:
+  free(child_ptr->vgraph_name);
 
 free_struct: