Changeset 52

Timestamp:

Jun 20, 2009, 6:22:13 PM (15 years ago)

Author:

george

Message:

• Opraveno: Spuštěcí skript serverů start.sh spustí procesy emulátoru pouze pokud ještě nejsou spouštěné.

Location:

trunk/www

Files:

• server.php (modified) (2 diffs)
• task.php (modified) (2 diffs)
• user.php (modified) (2 diffs)

trunk/www/server.php

@@ -100 +100 @@
     $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',
+      'server/'.$this->Id.'/bin/start.sh',
       'php www/shell.php ServerUnLock '.$this->Id,
     ));
@@ -203 +202 @@
     // Start script
     $ScriptFileName = '../server/'.$this->Id.'/bin/start.sh';
+    $Content = array
+    (
+      '#!/bin/sh',
+      'if [ -z `ps -ef | grep \'SCREEN -A -m -d -S server'.$this->Id.'-realmd\' | grep -v grep | awk \'{print $2}\'` ]',
+      'then',
+      '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',
+      'fi',
+      'if [ -z `ps -ef | grep \'SCREEN -A -m -d -S server'.$this->Id.'-worldd\' | grep -v grep | awk \'{print $2}\'` ]',
+      'then',
+      'screen -A -m -d -S server'.$this->Id.'-worldd server/'.$this->Id.'/bin/worldd_restarter.sh',
+      'fi',
+    );
+    file_put_contents($ScriptFileName, implode("\n", $Content));
+    chmod($ScriptFileName, 0777);    
+
+    $ScriptFileName = '../server/'.$this->Id.'/bin/worldd_restarter.sh';
     $Content = array
     (

trunk/www/task.php

@@ -24 +24 @@
     chdir($Config['BaseDir']);
     $DbResult = $this->Database->query('SELECT * FROM Task WHERE State = 0 ORDER BY Id,TimeCreate ASC');
-    $this->Database->query('UPDATE Task SET State=2 WHERE State=1'); // Change not finished running tasks to finished
-    $this->Database->query('UPDATE Task SET TimeEnd=NOW() WHERE State=2 AND TimeEnd = NULL'); // Set end time to finished tasks
     while($Task = $DbResult->fetch_assoc())
     {
@@ -45 +43 @@
   function ProcessAllCycle()
   {
+    $this->Database->query('UPDATE Task SET State=2 WHERE State=1'); // Change not finished running tasks to finished
+    $this->Database->query('UPDATE Task SET TimeEnd=NOW() WHERE State=2 AND TimeEnd = NULL'); // Set end time to finished tasks
     while(1)
     {

trunk/www/user.php

@@ -45 +45 @@
     $SID = session_id();
 
+    // Remove nonactive users
+    $DbResult = $this->Database->select('UserOnline', 'Id, User', 'ActivityTime < DATE_SUB(NOW(), INTERVAL '.$this->OnlineStateTimeout.' SECOND)');
+    while($DbRow = $DbResult->fetch_array())
+    {
+      if($DbRow['User'] != $this->AnonymousUserId) $this->System->Modules['Log']->NewRecord('User', 'Logout');
+      $this->Database->delete('UserOnline', 'Id='.$DbRow['Id']);
+    }
+
     // Lookup user record
     $Query = $this->Database->select('UserOnline', '*', 'SessionId="'.$SID.'"');
@@ -65 +73 @@
       $Result = USER_NOT_LOGGED;
     }
-
-    // Remove nonactive users
-    $DbResult = $this->Database->select('UserOnline', 'Id, User', 'ActivityTime < DATE_SUB(NOW(), INTERVAL '.$this->OnlineStateTimeout.' SECOND)');
-    while($DbRow = $DbResult->fetch_array())
-    {
-      if($DbRow['User'] != $this->AnonymousUserId) $this->System->Modules['Log']->NewRecord('User', 'Logout');
-      $this->Database->delete('UserOnline', 'Id='.$DbRow['Id']);
-    }
-
-    // Lookup user record
-    $Query = $this->Database->select('UserOnline', '*', 'SessionId="'.$SID.'"');
-    if($Query->num_rows == 0)
-      $this->Database->insert('UserOnline', array('SessionId' => $SID, 'User' => $this->AnonymousUserId, 'LoginTime' => 'NOW()', 'ActivityTime' => 'NOW()', 'IpAddress' => GetRemoteAddress(), 'HostName' => gethostbyaddr(GetRemoteAddress()), 'ScriptName' => $_SERVER['PHP_SELF']));
 
     // Refresh time of last access