modify config tag

helper/room/access_client.php

@@ -36,8 +36,8 @@ class access_client extends tcp_client
     {
         global $config;
 
-        $host = $config['room']['host'];
-        $port = $config['room']['port'];
+        $host = $config['room_srv']['host'];
+        $port = $config['room_srv']['port'];
         return "{$host}:{$port}";
     }
 

helper/room/base_room.php

@@ -198,7 +198,7 @@ abstract class base_room extends base_info
     public function leaveOp($input)
     {
         $this->clear();
-        
+
         $room_key = $input['room_key'];
         $userinfo = $this->find($room_key);
         if($userinfo == false) return false;

helper/room/factory_client.php

@@ -38,8 +38,8 @@ class factory_client extends tcp_client
     {
         global $config;
 
-        $host = $config['factory']['host'];
-        $port = $config['factory']['port'];
+        $host = $config['room_factory']['host'];
+        $port = $config['room_factory']['port'];
         return "{$host}:{$port}";
     }
 

helper/room/factory_processor.php

@@ -28,7 +28,7 @@ class factory_processor implements IProcessor
     private function init()
     {
         global $config;
-        $room_addrs = $config['rooms_addr'];
+        $room_addrs = $config['room_factory']['rooms_addr'];
         foreach ($room_addrs as $addr) {
             $room_client = new room_client($addr['host'],$addr['port']);
             $this->mRoomClients[] = $room_client;

mobile/control/game.php

@@ -22,7 +22,7 @@ class gameControl extends mbMemberControl
     public function shakeOp()
     {
         global $config;
-        $shake_room = $config['rooms']['shake_bonus'];
+        $shake_room = $config['special_rooms']['shake_bonus'];
 
         $_SESSION['client_type'] = "wap";
 

restart.py

@@ -112,12 +112,19 @@ def main():
             cmds.append({'file_name': 'ugc_srv.php',    'cmd': 'php ugc_srv.php'})
         elif option == 'center':
             cmds.append({'file_name': 'centra_srv.php', 'cmd': 'php centra_srv.php'})
+        elif option == 'room':
+            cmds.append({'file_name': 'room_factory.php',   'cmd': 'php room_factory.php'})
+            cmds.append({'file_name': 'room_srv.php',       'cmd': 'php room_srv.php'})
+            cmds.append({'file_name': 'mac_webacc',         'cmd': './webacc'})
         elif option == 'all':
             cmds.append({'file_name': 'fcgi_run.php',   'cmd': 'spawn-fcgi -a 127.0.0.1 -p 9100 -F 10 -f "php fcgi_run.php"'})
             cmds.append({'file_name': 'crontab.php',    'cmd': ''})
             cmds.append({'file_name': 'ugcman',         'cmd': './ugcman'})
             cmds.append({'file_name': 'ugc_srv.php',    'cmd': 'php ugc_srv.php'})
             cmds.append({'file_name': 'centra_srv.php', 'cmd': 'php centra_srv.php'})
+            cmds.append({'file_name': 'room_factory.php',   'cmd': 'php room_factory.php'})
+            cmds.append({'file_name': 'room_srv.php',       'cmd': 'php room_srv.php'})
+            cmds.append({'file_name': 'mac_webacc',         'cmd': './webacc'})
         else:
             cmds.append({'file_name': 'fcgi_run.php',   'cmd': 'spawn-fcgi -a 127.0.0.1 -p 9100 -F 10 -f "php fcgi_run.php"'})
             cmds.append({'file_name': 'crontab.php',    'cmd': ''})

room_factory.php

@@ -46,7 +46,7 @@ function fork_subprocess($count,$listen_fd)
     elseif($pid === -1)
     {
         Log::record("pid = {$pid} count = {$count} ",Log::DEBUG);
-        die('could not fork');
+        die('could not forkp');
     }
     else
     {

room_srv.php

@@ -65,8 +65,8 @@ function fork_subprocess($count,$listen_fd)
 function remote_addr()
 {
     global $config;
-    $host = $config['room']['host'];
-    $port = $config['room']['port'];
+    $host = $config['room_srv']['host'];
+    $port = $config['room_srv']['port'];
     return "{$host}:{$port}";
 }