Add image name to transfer.

This should allow the user to more readily know what image was transfered, the files of that image that were transferred, and potentially more suitable start and end time. The start might need to be added to the logname to make things simpler.
FOGProject · Jan 7, 2017 · e6d9032 · e6d9032
1 parent 2e10229
commit e6d9032
Show file tree

Hide file tree

Showing 10 changed files with 174 additions and 171 deletions.
diff --git a/packages/web/lib/fog/system.class.php b/packages/web/lib/fog/system.class.php
@@ -53,7 +53,7 @@ private static function _versionCompare()
     public function __construct()
     {
         self::_versionCompare();
-        define('FOG_VERSION', '5');
+        define('FOG_VERSION', '6');
         define('FOG_SCHEMA', 245);
         define('FOG_BCACHE_VER', 111);
         define('FOG_SVN_REVISION', 6052);

diff --git a/packages/web/lib/service/fogservice.class.php b/packages/web/lib/service/fogservice.class.php
@@ -341,7 +341,9 @@ protected function replicateItems(
             $findWhere['isMaster'] = 1;
         }
         $StorageNode = self::getClass('StorageNode', $myStorageNodeID);
-        if (!$StorageNode->isValid() || !$StorageNode->get('isMaster')) {
+        if (!$StorageNode->isValid()
+            || !$StorageNode->get('isMaster')
+        ) {
             throw new Exception(
                 sprintf(
                     ' * %s',
@@ -622,7 +624,8 @@ protected function replicateItems(
                     continue;
                 }
                 $logname = sprintf(
-                    '%s.transfer.%s.log',
+                    '%s.%s.transfer.%s.log',
+                    $Obj->get('name'),
                     static::$log,
                     $nodename
                 );

diff --git a/packages/web/management/languages/de_DE.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/de_DE.UTF-8/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fog-project-2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-06 07:59-0500\n"
+"POT-Creation-Date: 2017-01-06 20:37-0500\n"
 "PO-Revision-Date: 2016-05-23 07:36-0400\n"
 "Last-Translator: vspushbullet <vspushbullet@gmail.com>\n"
 "Language-Team: German\n"
@@ -201,9 +201,9 @@ msgstr "Datensatz wurde nicht gefunden, Fehler: %s"
 #: /var/www/fog/lib/plugins/taskstateedit/pages/taskstateeditmanagementpage.class.php:62
 #: /var/www/fog/lib/plugins/taskstateedit/pages/taskstateeditmanagementpage.class.php:122
 #: /var/www/fog/lib/plugins/pushbullet/pages/pushbulletmanagementpage.class.php:54
-#: /var/www/fog/lib/service/fogservice.class.php:374
-#: /var/www/fog/lib/service/fogservice.class.php:403
-#: /var/www/fog/lib/service/fogservice.class.php:478
+#: /var/www/fog/lib/service/fogservice.class.php:376
+#: /var/www/fog/lib/service/fogservice.class.php:405
+#: /var/www/fog/lib/service/fogservice.class.php:480
 #: /var/www/fog/commons/text.php:66
 msgid "Name"
 msgstr "Name"
@@ -6896,7 +6896,7 @@ msgid "No snapins associated with this group as master"
 msgstr "Es gibt keine Verbindung mit diesem Host snapins"
 
 #: /var/www/fog/lib/service/snapinhash.class.php:156
-#: /var/www/fog/lib/service/fogservice.class.php:388
+#: /var/www/fog/lib/service/fogservice.class.php:390
 msgid "Found"
 msgstr ""
 
@@ -7041,69 +7041,69 @@ msgstr ""
 msgid "Waiting for mysql to be available"
 msgstr "Warten auf Mysql zur Verfügung stehen"
 
-#: /var/www/fog/lib/service/fogservice.class.php:348
+#: /var/www/fog/lib/service/fogservice.class.php:350
 #, fuzzy
 msgid "I am not the master for this group"
 msgstr " * Ich bin nicht der Meister"
 
-#: /var/www/fog/lib/service/fogservice.class.php:364
-#: /var/www/fog/lib/service/fogservice.class.php:468
+#: /var/www/fog/lib/service/fogservice.class.php:366
+#: /var/www/fog/lib/service/fogservice.class.php:470
 msgid "Not syncing"
 msgstr ""
 
-#: /var/www/fog/lib/service/fogservice.class.php:366
-#: /var/www/fog/lib/service/fogservice.class.php:470
+#: /var/www/fog/lib/service/fogservice.class.php:368
+#: /var/www/fog/lib/service/fogservice.class.php:472
 msgid "between"
 msgstr ""
 
-#: /var/www/fog/lib/service/fogservice.class.php:381
+#: /var/www/fog/lib/service/fogservice.class.php:383
 msgid "There are no other members to sync to"
 msgstr ""
 
-#: /var/www/fog/lib/service/fogservice.class.php:390
+#: /var/www/fog/lib/service/fogservice.class.php:392
 #, fuzzy
 msgid "to transfer to"
 msgstr "Bild-Übertragungsprotokoll"
 
-#: /var/www/fog/lib/service/fogservice.class.php:453
+#: /var/www/fog/lib/service/fogservice.class.php:455
 #, fuzzy
 msgid "Replication already running with PID"
 msgstr "Replikation Bandbreite"
 
-#: /var/www/fog/lib/service/fogservice.class.php:485
+#: /var/www/fog/lib/service/fogservice.class.php:487
 #, fuzzy
 msgid "File or path cannot be reached"
 msgstr " | Datei oder Pfad ist nicht erreichbar"
 
-#: /var/www/fog/lib/service/fogservice.class.php:505
+#: /var/www/fog/lib/service/fogservice.class.php:507
 #, fuzzy
 msgid "Cannot connect to"
 msgstr "Keine Verbindung zu Knoten."
 
-#: /var/www/fog/lib/service/fogservice.class.php:591
+#: /var/www/fog/lib/service/fogservice.class.php:593
 msgid "Files do not match"
 msgstr ""
 
-#: /var/www/fog/lib/service/fogservice.class.php:597
+#: /var/www/fog/lib/service/fogservice.class.php:599
 #, fuzzy
 msgid "Deleting remote file"
 msgstr "Menü Erstellen fehlgeschlagen"
 
-#: /var/www/fog/lib/service/fogservice.class.php:608
+#: /var/www/fog/lib/service/fogservice.class.php:610
 msgid "No need to sync"
 msgstr ""
 
-#: /var/www/fog/lib/service/fogservice.class.php:610
+#: /var/www/fog/lib/service/fogservice.class.php:612
 #, fuzzy
 msgid "file to"
 msgstr "Fehler beim"
 
-#: /var/www/fog/lib/service/fogservice.class.php:633
+#: /var/www/fog/lib/service/fogservice.class.php:636
 #, fuzzy
 msgid "Starting Sync Actions"
 msgstr " * Start Sync-Aktionen"
 
-#: /var/www/fog/lib/service/fogservice.class.php:677
+#: /var/www/fog/lib/service/fogservice.class.php:680
 msgid "Started sync for"
 msgstr "Gestartet Sync für"
 

diff --git a/packages/web/management/languages/en_US.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/en_US.UTF-8/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-06 07:59-0500\n"
+"POT-Creation-Date: 2017-01-06 20:37-0500\n"
 "PO-Revision-Date: 2016-05-22 15:14-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -200,9 +200,9 @@ msgstr "Record not found, Error: %s"
 #: /var/www/fog/lib/plugins/taskstateedit/pages/taskstateeditmanagementpage.class.php:62
 #: /var/www/fog/lib/plugins/taskstateedit/pages/taskstateeditmanagementpage.class.php:122
 #: /var/www/fog/lib/plugins/pushbullet/pages/pushbulletmanagementpage.class.php:54
-#: /var/www/fog/lib/service/fogservice.class.php:374
-#: /var/www/fog/lib/service/fogservice.class.php:403
-#: /var/www/fog/lib/service/fogservice.class.php:478
+#: /var/www/fog/lib/service/fogservice.class.php:376
+#: /var/www/fog/lib/service/fogservice.class.php:405
+#: /var/www/fog/lib/service/fogservice.class.php:480
 #: /var/www/fog/commons/text.php:66
 msgid "Name"
 msgstr "Name"
@@ -6872,7 +6872,7 @@ msgid "No snapins associated with this group as master"
 msgstr "There are no snapins associated with this host"
 
 #: /var/www/fog/lib/service/snapinhash.class.php:156
-#: /var/www/fog/lib/service/fogservice.class.php:388
+#: /var/www/fog/lib/service/fogservice.class.php:390
 msgid "Found"
 msgstr ""
 
@@ -7017,69 +7017,69 @@ msgstr ""
 msgid "Waiting for mysql to be available"
 msgstr "Waiting for mysql to be available"
 
-#: /var/www/fog/lib/service/fogservice.class.php:348
+#: /var/www/fog/lib/service/fogservice.class.php:350
 #, fuzzy
 msgid "I am not the master for this group"
 msgstr " * I am not the master"
 
-#: /var/www/fog/lib/service/fogservice.class.php:364
-#: /var/www/fog/lib/service/fogservice.class.php:468
+#: /var/www/fog/lib/service/fogservice.class.php:366
+#: /var/www/fog/lib/service/fogservice.class.php:470
 msgid "Not syncing"
 msgstr ""
 
-#: /var/www/fog/lib/service/fogservice.class.php:366
-#: /var/www/fog/lib/service/fogservice.class.php:470
+#: /var/www/fog/lib/service/fogservice.class.php:368
+#: /var/www/fog/lib/service/fogservice.class.php:472
 msgid "between"
 msgstr ""
 
-#: /var/www/fog/lib/service/fogservice.class.php:381
+#: /var/www/fog/lib/service/fogservice.class.php:383
 msgid "There are no other members to sync to"
 msgstr ""
 
-#: /var/www/fog/lib/service/fogservice.class.php:390
+#: /var/www/fog/lib/service/fogservice.class.php:392
 #, fuzzy
 msgid "to transfer to"
 msgstr "Image Transfer Log"
 
-#: /var/www/fog/lib/service/fogservice.class.php:453
+#: /var/www/fog/lib/service/fogservice.class.php:455
 #, fuzzy
 msgid "Replication already running with PID"
 msgstr "Replication Bandwidth"
 
-#: /var/www/fog/lib/service/fogservice.class.php:485
+#: /var/www/fog/lib/service/fogservice.class.php:487
 #, fuzzy
 msgid "File or path cannot be reached"
 msgstr " | File or path cannot be reached"
 
-#: /var/www/fog/lib/service/fogservice.class.php:505
+#: /var/www/fog/lib/service/fogservice.class.php:507
 #, fuzzy
 msgid "Cannot connect to"
 msgstr "Cannot connect to node."
 
-#: /var/www/fog/lib/service/fogservice.class.php:591
+#: /var/www/fog/lib/service/fogservice.class.php:593
 msgid "Files do not match"
 msgstr ""
 
-#: /var/www/fog/lib/service/fogservice.class.php:597
+#: /var/www/fog/lib/service/fogservice.class.php:599
 #, fuzzy
 msgid "Deleting remote file"
 msgstr "Menu create failed"
 
-#: /var/www/fog/lib/service/fogservice.class.php:608
+#: /var/www/fog/lib/service/fogservice.class.php:610
 msgid "No need to sync"
 msgstr ""
 
-#: /var/www/fog/lib/service/fogservice.class.php:610
+#: /var/www/fog/lib/service/fogservice.class.php:612
 #, fuzzy
 msgid "file to"
 msgstr "Failed to"
 
-#: /var/www/fog/lib/service/fogservice.class.php:633
+#: /var/www/fog/lib/service/fogservice.class.php:636
 #, fuzzy
 msgid "Starting Sync Actions"
 msgstr " * Starting Sync Actions"
 
-#: /var/www/fog/lib/service/fogservice.class.php:677
+#: /var/www/fog/lib/service/fogservice.class.php:680
 msgid "Started sync for"
 msgstr "Started sync for"
 

diff --git a/packages/web/management/languages/es_ES.UTF-8/LC_MESSAGES/messages.po b/packages/web/management/languages/es_ES.UTF-8/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-06 07:59-0500\n"
+"POT-Creation-Date: 2017-01-06 20:37-0500\n"
 "PO-Revision-Date: 2016-05-22 15:14-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -203,9 +203,9 @@ msgstr "Registro no encontrado, error: %s"
 #: /var/www/fog/lib/plugins/taskstateedit/pages/taskstateeditmanagementpage.class.php:62
 #: /var/www/fog/lib/plugins/taskstateedit/pages/taskstateeditmanagementpage.class.php:122
 #: /var/www/fog/lib/plugins/pushbullet/pages/pushbulletmanagementpage.class.php:54
-#: /var/www/fog/lib/service/fogservice.class.php:374
-#: /var/www/fog/lib/service/fogservice.class.php:403
-#: /var/www/fog/lib/service/fogservice.class.php:478
+#: /var/www/fog/lib/service/fogservice.class.php:376
+#: /var/www/fog/lib/service/fogservice.class.php:405
+#: /var/www/fog/lib/service/fogservice.class.php:480
 #: /var/www/fog/commons/text.php:66
 msgid "Name"
 msgstr "Nombre"
@@ -6890,7 +6890,7 @@ msgid "No snapins associated with this group as master"
 msgstr "No hay snapins asociados con este anfitrión"
 
 #: /var/www/fog/lib/service/snapinhash.class.php:156
-#: /var/www/fog/lib/service/fogservice.class.php:388
+#: /var/www/fog/lib/service/fogservice.class.php:390
 msgid "Found"
 msgstr ""
 
@@ -7035,69 +7035,69 @@ msgstr ""
 msgid "Waiting for mysql to be available"
 msgstr "A la espera de MySQL esté disponible"
 
-#: /var/www/fog/lib/service/fogservice.class.php:348
+#: /var/www/fog/lib/service/fogservice.class.php:350
 #, fuzzy
 msgid "I am not the master for this group"
 msgstr " * No soy el maestro"
 
-#: /var/www/fog/lib/service/fogservice.class.php:364
-#: /var/www/fog/lib/service/fogservice.class.php:468
+#: /var/www/fog/lib/service/fogservice.class.php:366
+#: /var/www/fog/lib/service/fogservice.class.php:470
 msgid "Not syncing"
 msgstr ""
 
-#: /var/www/fog/lib/service/fogservice.class.php:366
-#: /var/www/fog/lib/service/fogservice.class.php:470
+#: /var/www/fog/lib/service/fogservice.class.php:368
+#: /var/www/fog/lib/service/fogservice.class.php:472
 msgid "between"
 msgstr ""
 
-#: /var/www/fog/lib/service/fogservice.class.php:381
+#: /var/www/fog/lib/service/fogservice.class.php:383
 msgid "There are no other members to sync to"
 msgstr ""
 
-#: /var/www/fog/lib/service/fogservice.class.php:390
+#: /var/www/fog/lib/service/fogservice.class.php:392
 #, fuzzy
 msgid "to transfer to"
 msgstr "Transferencia de imágenes Entrar"
 
-#: /var/www/fog/lib/service/fogservice.class.php:453
+#: /var/www/fog/lib/service/fogservice.class.php:455
 #, fuzzy
 msgid "Replication already running with PID"
 msgstr "Ancho de banda de replicación"
 
-#: /var/www/fog/lib/service/fogservice.class.php:485
+#: /var/www/fog/lib/service/fogservice.class.php:487
 #, fuzzy
 msgid "File or path cannot be reached"
 msgstr " | El archivo o la ruta no puede ser alcanzado"
 
-#: /var/www/fog/lib/service/fogservice.class.php:505
+#: /var/www/fog/lib/service/fogservice.class.php:507
 #, fuzzy
 msgid "Cannot connect to"
 msgstr "No se puede conectar al nodo."
 
-#: /var/www/fog/lib/service/fogservice.class.php:591
+#: /var/www/fog/lib/service/fogservice.class.php:593
 msgid "Files do not match"
 msgstr ""
 
-#: /var/www/fog/lib/service/fogservice.class.php:597
+#: /var/www/fog/lib/service/fogservice.class.php:599
 #, fuzzy
 msgid "Deleting remote file"
 msgstr "Menú Error de creación"
 
-#: /var/www/fog/lib/service/fogservice.class.php:608
+#: /var/www/fog/lib/service/fogservice.class.php:610
 msgid "No need to sync"
 msgstr ""
 
-#: /var/www/fog/lib/service/fogservice.class.php:610
+#: /var/www/fog/lib/service/fogservice.class.php:612
 #, fuzzy
 msgid "file to"
 msgstr "No se pudo"
 
-#: /var/www/fog/lib/service/fogservice.class.php:633
+#: /var/www/fog/lib/service/fogservice.class.php:636
 #, fuzzy
 msgid "Starting Sync Actions"
 msgstr " * A partir de sincronización acciones"
 
-#: /var/www/fog/lib/service/fogservice.class.php:677
+#: /var/www/fog/lib/service/fogservice.class.php:680
 msgid "Started sync for"
 msgstr "sincronización iniciado por"