Changeset 63

Timestamp:

Aug 5, 2009, 8:06:27 AM (15 years ago)

Author:

george

Message:

• Přidáno: Funkce a skript pro aktualizaci stavových údajů. Bude prováděno každou minutu nebo automaticky přímo systémem při určitých operacích.
• Opraveno: Generování přístupu k databázi v nastavení emulátoru.

Location:

trunk

Files:

• bin/update_state.sh (added)
• www/model/realm.php (modified) (4 diffs)
• www/model/server.php (modified) (2 diffs)
• www/model/shell.php (modified) (1 diff)
• www/view/server.php (modified) (1 diff)

trunk/www/model/realm.php

@@ -213 +213 @@
     $EmulatorConfig = new MangosConfigurationFile($this->Database);
     $EmulatorConfig->Load($EmulatorEtcDir.'mangosd.conf.dist');
-    $EmulatorConfig->ParameterList['LoginDatabaseInfo'] = 'localhost;3306;server'.$this->Id.';server'.$this->Id.';server'.$this->Data['Server'].'_realmd';
-    $EmulatorConfig->ParameterList['WorldDatabaseInfo'] = 'localhost;3306;server'.$this->Id.';server'.$this->Id.';realm'.$this->Id.'_mangos';
+    $EmulatorConfig->ParameterList['LoginDatabaseInfo'] = 'localhost;3306;server'.$this->Data['Server'].';server'.$this->Data['Server'].';server'.$this->Data['Server'].'_realmd';
+    $EmulatorConfig->ParameterList['WorldDatabaseInfo'] = 'localhost;3306;server'.$this->Data['Server'].';server'.$this->Data['Server'].';realm'.$this->Id.'_mangos';
     $EmulatorConfig->ParameterList['CharacterDatabaseInfo'] = 'localhost;3306;server'.$this->Data['Server'].';server'.$this->Data['Server'].';realm'.$this->Id.'_characters';
     $EmulatorConfig->ParameterList['ScriptDev2DatabaseInfo'] = 'localhost;3306;server'.$this->Data['Server'].';server'.$this->Data['Server'].';realm'.$this->Id.'_scriptdev2';
@@ -307 +307 @@
     $Output = array();
     if(isset($this->Data['Database']['Emulator']['Id']))
-      exec('ps -aux|grep "emulator/'.$this->Data['Database']['Emulator']['Id'].'/bin/mangos-worldd -c realm/'.$this->Id.'/etc/mangosd.conf"| grep -v grep', $Output);
+      exec('ps aux|grep "emulator/'.$this->Data['Database']['Emulator']['Id'].'/bin/mangos-worldd -c realm/'.$this->Id.'/etc/mangosd.conf"| grep -v grep', $Output);
     if(count($Output) > 0)
     {
@@ -321 +321 @@
     while(true)
     {
-      $Reders = array($File);
-      if(stream_select($Reders, $Writers=null, $Except=null, 0, 15) < 1)
+      $Readers = array($File);
+      if(stream_select($Readers, $Writers=null, $Except=null, 0, 15) < 1)
       {
         continue;
@@ -343 +343 @@
     return($DbRow['User']);
   }
+  
+  function UpdateState()
+  {
+    $State = $this->GetState();
+    $this->Database->update('Realm', 'Id='.$this->Id, array(
+      'Online' => $State['Online'], 
+      'CharacterOnlineCount' => $State['CharacterOnlineCount'],
+      'CharacterCount' => $State['CharacterCount'],  
+    ));
+  }
+  
+  function UpdateStateAll()
+  {
+    $DbResult = $this->Database->select('Realm', 'Id');
+    while($DbRow = $DbResult->fetch_assoc())
+    {
+      $Realm = new Realm($this->Database, $DbRow['Id']);
+      $Realm->UpdateState();
+    }    
+  } 
 }
 

trunk/www/model/server.php

@@ -162 +162 @@
   }
   
-  function UpdateServerList()
+  function UpdateState()
+  {
+    $State = $this->GetState();
+    $this->Database->update('Server', 'Id='.$this->Id, array(
+      'Online' => $State['Online'], 
+      'AccountCount' => $State['AccountCount'],
+    ));
+  } 
+  
+  function UpdateStateAll()
   {
     $DbResult = $this->Database->select('Server', 'Id');
@@ -168 +177 @@
     {
       $Server = new Server($this->Database, $DbRow['Id']);
-      $ServerState = $Server->GetState();
-      $this->Database->update('Server', 'Id='.$DbRow['Id'], array(
-        'Online' => $ServerState['Online'], 
-        'AccountCount' => $ServerState['AccountCount'],
-      ));
+      $Server->UpdateState();
     }    
   } 

trunk/www/model/shell.php

@@ -138 +138 @@
         $this->HistoryUpdate();
       } else 
+      if($Command == 'UpdateState')
+      {
+        $Realm = new Realm($this->Database, 0);
+        $Realm->UpdateStateAll();
+        $Server = new Server($this->Database, 0);
+        $Server->UpdateStateAll();
+      } else 
       if($Command == 'ServerDatabaseChange')
       {

trunk/www/view/server.php

@@ -84 +84 @@
     global $Config;
     
-    $Server = new Server($this->Database, 0);
-    $Server->UpdateServerList();
     $Output = '<h4>Seznam serverů</h4>';
     $Table = new Table($this->ItemListFormClass);