remove unused server scheduling code

Author: jacob-grahn

common/cron/weekly.php

@@ -22,7 +22,6 @@
 bans_delete_old($pdo);
 users_reset_status($pdo);
 best_levels_reset($pdo);
-# restart_servers($pdo);
 all_optimize($pdo, $DB_NAME);
 
 // deletes old accounts every four weeks

common/manage_socket/check_servers.php

@@ -1,113 +1,6 @@
 <?php
 
 
-// restarts all servers (shuts down and starts)
-function restart_servers($pdo, $output = true)
-{
-    global $SERVER_IP;
-
-    // find servers
-    $servers = servers_select($pdo);
-
-    // output
-    if ($output === true) {
-        output('Restarting all active servers...');
-    }
-
-    // shut down and restart all servers
-    foreach ($servers as $server) {
-        if ($server->address == $SERVER_IP) {
-            restart_server(PR2_ROOT . '/pr2.php', $server->address, $server->port, $server->salt, $server->server_id);
-        } else {
-            output("ERROR: Server #$server->server_id's address doesn't match the server IP.");
-            continue;
-        }
-    }
-
-    // output
-    if ($output === true) {
-        output('All server restart operations complete.');
-    }
-}
-
-
-// restart a server
-function restart_server($script, $address, $port, $salt, $server_id, $verbose = false)
-{
-    $pid = read_pid($port);
-    shut_down_server($pid, $address, $port, $salt);
-    sleep(1);
-    start_server($script, $port, $server_id, $verbose);
-}
-
-
-// test all servers and start the ones that aren't running
-function check_servers($pdo)
-{
-    global $SERVER_IP, $COMM_PASS;
-
-    // test the policy server
-    test_server(ROOT_DIR . '/policy_server/run_policy.php', 'localhost', 843, $COMM_PASS, 0);
-
-    // load all active servers
-    $servers = servers_select($pdo);
-
-    // test all active servers at this address
-    foreach ($servers as $server) {
-        if ($server->address == $SERVER_IP) {
-            output("Testing $server->server_name (ID #$server->server_id)...");
-            test_server(PR2_ROOT . '/pr2.php', 'localhost', $server->port, $server->salt, $server->server_id);
-        }
-    }
-
-    // tell it to the world
-    output('All servers tested.');
-    return $servers;
-}
-
-
-// starts a server if it is not running
-function test_server($script, $address, $port, $salt, $server_id)
-{
-    // tell the world
-    output("Beginning test for server #$server_id at $address:$port ($script)");
-
-    // connect
-    $result = connect_to_server($address, $port, $salt);
-
-    // test the server if able to connect
-    if ($result !== false) {
-        output("GOOD - Server #$server_id is running.");
-    } else {
-        output("BAD - Bad/No response from server #$server_id.");
-        restart_server($script, $address, $port, $salt, $server_id);
-    }
-
-    // tell the world
-    output("Test of server #$server_id at $address:$port complete.\n");
-}
-
-
-// starts a server
-function start_server($script, $port, $server_id, $verbose = false, $silent = false)
-{
-    if (!$silent) {
-        output("STARTING SERVER | Script: $script | Port: $port");
-    }
-
-    $log = ROOT_DIR . '/../pr2/log/' . $port . '-' . date("Fj-Y-g:ia") . '.log';
-    $verbose = $verbose === true ? 'true' : '';
-    $command = "nohup php $script $server_id $verbose > $log & echo $!";
-    if (!$silent) {
-        output("Executing command: $command");
-    }
-    $pid = exec($command);
-
-    write_pid($pid, $port, $silent);
-    return $pid;
-}
-
-
 // tests server connectivity
 function connect_to_server($address, $port, $salt)
 {
@@ -117,87 +10,6 @@ function connect_to_server($address, $port, $salt)
 }
 
 
-// graceful shutdown
-function shut_down_server($pid, $address, $port, $salt)
-{
-    $result = talk_to_server($address, $port, $salt, 'shut_down`', true);
-
-    // make sure the port is dead
-    if (!$result) {
-        $kill_res = kill_pid($pid);
-    }
-
-    // tell the world
-    if (@$kill_res === true) {
-        output("Shutdown of server running at $address:$port successful.");
-    } else {
-        output("A new server can now be started on port $port.");
-    }
-}
-
-
-// gets the pid file
-function get_pid_file($port)
-{
-    $pid_file = ROOT_DIR . '/../pr2/pid/' . $port . '.txt';
-    return $pid_file;
-}
-
-
-// write pid to a file
-function write_pid($pid, $port, $silent = false)
-{
-    $pid_file = get_pid_file($port);
-    if (!$silent) {
-        output("Writing PID for port $port to $pid_file: $pid...");
-    }
-    $handle = fopen($pid_file, 'w');
-    if ($handle) {
-        fwrite($handle, $pid);
-        fclose($handle);
-    }
-    if (!$silent) {
-        output("Write operation concluded.");
-    }
-}
-
-
-// read pid from file
-function read_pid($port)
-{
-    $pid_file = get_pid_file($port);
-    $pid = 0;
-    output("Reading the PID from $pid_file...");
-    $handle = fopen($pid_file, 'r');
-    if ($handle !== false) {
-        $pid = fread($handle, 999);
-        fclose($handle);
-        output("PID is: $pid");
-    } else {
-        output("The PID file does not exist.");
-    }
-    return $pid;
-}
-
-
-// kills a port
-function kill_pid($pid)
-{
-    if ($pid != null && $pid != 0 && $pid != '' && $pid != false) {
-        system("kill " . $pid, $k);
-        $pid = null;
-        if (!$k) {
-            return true;
-        } else {
-            return false;
-        }
-    } else {
-        output('There is no PID to kill.');
-        return true;
-    }
-}
-
-
 // send a command to the server
 function talk_to_server($address, $port, $salt, $process_function, $receive = true, $output = true)
 {

common/manage_socket/restart_server.php

@@ -48,9 +48,7 @@ function run_update_cycle($pdo)
     $send_str = json_encode($send);
 
     // check servers and send the data
-    $server_list = check_servers($pdo, false);
-    output("Waiting 1 second before proceeding...\n");
-    sleep(1);
+    $server_list = servers_select($pdo);
     $servers = poll_servers($server_list, 'update_cycle`' . $send_str);
 
     // process replies

common/manage_socket/restart_servers.php

@@ -217,7 +217,7 @@ function create_server($pdo, $guild_id, $days_of_life)
 
             // insert and start server
             $server_id = server_insert($pdo, $life_from_now, $server_name, $SERVER_IP, $port, $guild_id);
-            start_server(PR2_ROOT . '/pr2.php', $port, $server_id, false, true);
+            # start_server(PR2_ROOT . '/pr2.php', $port, $server_id, false, true);
 
             // return data
             $ret->new_time = $life_from_now;
@@ -234,7 +234,7 @@ function create_server($pdo, $guild_id, $days_of_life)
             // update info (and activate server if applicable)
             server_update_expire_time($pdo, $life_from_expiry, $server_id);
             if (!$active) { // if it wasn't active, start the server
-                start_server(PR2_ROOT . '/pr2.php', $port, $server_id, false, true);
+                # start_server(PR2_ROOT . '/pr2.php', $port, $server_id, false, true);
             }
 
             // return data

common/manage_socket/socket_manage_fns.php

@@ -492,24 +492,6 @@ function shutdown_server($socket = null, $die = true, $msg = 'The server is rest
 }
 
 
-// graceful restart
-function restart_server()
-{
-    global $server_id;
-
-    // kill socket
-    kill_socket();
-
-    // disconnect everyone
-    shutdown_server(null, false);
-
-    // start new instance of server
-    $server_id = (int) $server_id;
-    echo shell_exec('php ' . COMMON_DIR . "/manage_socket/restart_server.php $server_id");
-    die(output("The restart was successful."));
-}
-
-
 // not so graceful shutdown
 function __crashHandler($force = false)
 {

functions/cron/cron_fns.php

@@ -314,7 +314,7 @@ private function commandAdminDebug()
                         db_op('admin_action_insert', array($this->from_id, $msg, 'restart-server', $this->player->ip));
                         output("$name_str ($this->from_id) initiated a server shutdown.");
                         $this->write('systemChat`Restarting...');
-                        restart_server();
+                        shutdown_server()
                     }
                 } else {
                     $this->write('systemChat`This command cannot be used in levels.');