Changeset 35 for trunk/www/server.php

Timestamp:

Jun 15, 2009, 10:19:02 AM (15 years ago)

Author:

george

Message:

• Upraveno: Zamykání a odemykání prostředků přímo z příkazů úloh. Zamykání serverů, emulátorů a záloh.
• Upraveno: Možnost volat shell.php z relativní cestou. Skript global.php si nastaví sám aktuální cestu.
• Opraveno: Zobrazovat sprváně trvání aktuálně běžící úlohy.

File:

• trunk/www/server.php (modified) (7 diffs)

trunk/www/server.php

@@ -58 +58 @@
     $this->Lock();
     $CommandList = array(
+      'php www/shell.php ServerLock '.$this->Id,
+    );
+    if($Delete == true) 
+    {
+      $CommandList = array_merge($CommandList, array(
+        'mysql --silent --skip-column-names -u server'.$this->Id.' -pserver'.$this->Id.' server'.$this->Id.'_mangos -e "show tables" | gawk \'{print "drop table " $1 ";"}\' | mysql -u server'.$this->Id.' -pserver'.$this->Id.' server'.$this->Id.'_mangos',
+        'mysql --silent --skip-column-names -u server'.$this->Id.' -pserver'.$this->Id.' server'.$this->Id.'_characters -e "show tables" | gawk \'{print "drop table " $1 ";"}\' | mysql -u server'.$this->Id.' -pserver'.$this->Id.' server'.$this->Id.'_characters',
+      'mysql --silent --skip-column-names -u server'.$this->Id.' -pserver'.$this->Id.' server'.$this->Id.'_realmd -e "show tables" | gawk \'{print "drop table " $1 ";"}\' | mysql -u server'.$this->Id.' -pserver'.$this->Id.' server'.$this->Id.'_realmd',
+      'mysql --silent --skip-column-names -u server'.$this->Id.' -pserver'.$this->Id.' server'.$this->Id.'_scriptdev2 -e "show tables" | gawk \'{print "drop table " $1 ";"}\' | mysql -u server'.$this->Id.' -pserver'.$this->Id.' server'.$this->Id.'_scriptdev2',
+      ));
+    }
+    $CommandList = array_merge($CommandList, array(
       'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_mangos < database/'.$this->Server['Database']['Id'].'/'.$this->Server['Database']['SourceFileName'],
       'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_scriptdev2 < emulator/'.$this->Server['Database']['Emulator']['Id'].'/source/src/bindings/ScriptDev2/sql/scriptdev2_create_structure.sql',
@@ -64 +76 @@
       'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_realmd < emulator/'.$this->Server['Database']['Emulator']['Id'].'/share/mangos/sql/realmd.sql',
       'mysql --user=server'.$this->Id.' --password=server'.$this->Id.' server'.$this->Id.'_characters < emulator/'.$this->Server['Database']['Emulator']['Id'].'/share/mangos/sql/characters.sql',
-    );
-    if($Delete == true) 
-    {
-      array_unshift($CommandList, 'mysql --silent --skip-column-names -u server'.$this->Id.' -pserver'.$this->Id.' server'.$this->Id.'_mangos -e "show tables" | gawk \'{print "drop table " $1 ";"}\' | mysql -u server'.$this->Id.' -pserver'.$this->Id.' server'.$this->Id.'_mangos');
-      array_unshift($CommandList, 'mysql --silent --skip-column-names -u server'.$this->Id.' -pserver'.$this->Id.' server'.$this->Id.'_characters -e "show tables" | gawk \'{print "drop table " $1 ";"}\' | mysql -u server'.$this->Id.' -pserver'.$this->Id.' server'.$this->Id.'_characters');
-      array_unshift($CommandList, 'mysql --silent --skip-column-names -u server'.$this->Id.' -pserver'.$this->Id.' server'.$this->Id.'_realmd -e "show tables" | gawk \'{print "drop table " $1 ";"}\' | mysql -u server'.$this->Id.' -pserver'.$this->Id.' server'.$this->Id.'_realmd');
-      array_unshift($CommandList, 'mysql --silent --skip-column-names -u server'.$this->Id.' -pserver'.$this->Id.' server'.$this->Id.'_scriptdev2 -e "show tables" | gawk \'{print "drop table " $1 ";"}\' | mysql -u server'.$this->Id.' -pserver'.$this->Id.' server'.$this->Id.'_scriptdev2');
-    }
+      'php www/shell.php ServerDatabaseChange '.$this->Server['Database']['Id'],
+      'php www/shell.php ServerUnLock '.$thisr->Id,
+    ));    
     $this->Task->Add('Inicializace databáze', $CommandList);
+    return('Úloha načtení nové databáze zařazena do fronty.');
   } 
   
@@ -79 +87 @@
     $this->Lock();
     $this->Task->Add('Start emulátoru', array(
+      'php www/shell.php ServerLock '.$this->Id,
       'screen -A -m -d -S server'.$this->Id.'-realmd emulator/'.$this->Server['Database']['Emulator']['Id'].'/bin/mangos-realmd -c server/'.$this->Id.'/etc/realmd.conf',
       'screen -A -m -d -S server'.$this->Id.'-worldd server/'.$this->Id.'/bin/start.sh',
+      'php www/shell.php ServerUnLock '.$this->Id,
     ));
     return('Požadavek na start serveru zařazen.');
@@ -89 +99 @@
     $this->Lock();
     $this->Task->Add('Zastavení emulátoru', array(
+      'php www/shell.php ServerLock '.$this->Id,
       'server/'.$this->Id.'/bin/stop.sh',
+      'php www/shell.php ServerUnLock '.$this->Id,
     ));
     return('Požadavek na zastavení serveru zařazen.');
@@ -283 +295 @@
     
     // Do update
-    $Commands = array();
+    $Commands = array(
+     'php www/shell.php ServerLock '.$this->Id,
+    );
     $DbResult = $this->Database->query('SELECT `Revision` FROM `Database` WHERE `Id` = '.$this->Server['Database']['Id']);
     $DbRow = $DbResult->fetch_assoc();
@@ -302 +316 @@
       }     
     }
+    $Commands = array_merge($Commands, array(
+      'php www/shell.php ServerDatabaseChange '.$DatabaseId,
+      'php www/shell.php ServerUnLock '.$this->Id,
+    ));
+
     $this->Task->Add('Aktualizace databáze', $Commands);
     $Output .= '<br />Úloha aktualizace serveru byla přidána do fronty.';
@@ -316 +335 @@
     $this->Database->update('Server', 'Id='.$this->Id, array('Lock' => 0));
   }
+  
+  function ChangeDatabaseId($Id)
+  {
+    $this->Database->update('Server', 'Id='.$this->Id, array('Database' => $Id));
+    $this->SaveConfiguration();
+  }
 }