Changeset 293

Timestamp:

11/24/06 19:57:07 (6 years ago)

Author:

lincoln

Message:

begin seperation of admin_status from operational status (laststatus)

Files:

• applications/shepherd (modified) (6 diffs)

applications/shepherd

@@ -290 +290 @@
         &log("$proggy v$latestversion failed ready test - marking as a pending update.\n");
         $components_pending_install->{$proggy}->{config} = $config;
+        $components_pending_install->{$proggy}->{updated} = time;
+
+        if (defined $components->{$proggy}) {
+            $components->{$proggy}->{admin_status} = sprintf "update to version %s pending: %s",
+                $latestversion, $components_pending_install->{$proggy}->{admin_status};
+        }
+
         return;
     }
@@ -305 +312 @@
     $components->{$proggy}->{ver} = $latestversion;
     $components->{$proggy}->{config} = $config;
-    $components->{$proggy}->{laststatus} = sprintf "updated to %s on %s", $latestversion, POSIX::strftime("%a%d%b%y",localtime(time));
+    $components->{$proggy}->{updated} = time;
+    $components->{$proggy}->{admin_status} = sprintf "updated from %s to %s", $oldver, $latestversion;
     delete $components_pending_install->{$proggy} if (defined $components_pending_install->{$proggy});
 
@@ -397 +405 @@
         # mark as successful but only if previously unsuccessful
         # (we only mark it if it was previously unsuccessful otherwise a --check
-        # will result in clearing out all of the laststatus fields)
+        # will result in clearing out all of the admin_status fields)
         $statusmsg = sprintf "tested successfully on %s", POSIX::strftime("%a%d%b%y", localtime(time))
           if ((defined $components->{$proggy}->{ready}) && (!$components->{$proggy}->{ready}));
@@ -405 +413 @@
     if ((defined $statusmsg) && ($statusmsg ne "")) {
         if ((defined $specific_version) && ($specific_version ne "")) {
-            $components_pending_install->{$proggy}->{laststatus} = $statusmsg;
+            $components_pending_install->{$proggy}->{admin_status} = $statusmsg;
         } else {
-            $components->{$proggy}->{laststatus} = $statusmsg;
+            $components->{$proggy}->{admin_status} = $statusmsg;
         }
     }
@@ -427 +435 @@
 
     delete $components->{$proggy}->{disabled};
-    $components->{$proggy}->{laststatus} = sprintf "enabled on %s, not run yet",POSIX::strftime("%a%d%b%y", localtime(time));
+    $components->{$proggy}->{admin_status} = sprintf "enabled on %s",POSIX::strftime("%a%d%b%y", localtime(time));
 }
 
@@ -449 +457 @@
     $n ||= 1;
     $components->{$proggy}->{disabled} = $n;
-    $components->{$proggy}->{laststatus} = sprintf "manually disabled on %s",POSIX::strftime("%a%d%b%y", localtime(time));
+    $components->{$proggy}->{admin_status} = sprintf "manually disabled on %s",POSIX::strftime("%a%d%b%y", localtime(time));
 }