Branch: Tag:

1997-08-13

1997-08-13 03:36:09 by David Hedbor <david@hedbor.org>

- "Statusbar" added to restart and shutdown pages.
- Shutdown and restart delayed 5 seconds to minimize the number of
broken pictures you might get if configuring a remote server over a
not-so-fast connection.
- Roxen capitalized in the shutdown action.

Rev: server/base_server/roxen.pike:1.97
Rev: server/etc/restart.html:1.12
Rev: server/etc/shutdown.html:1.7

1: - constant cvs_version = "$Id: roxen.pike,v 1.96 1997/08/13 03:02:02 grubba Exp $"; + constant cvs_version = "$Id: roxen.pike,v 1.97 1997/08/13 03:36:08 neotron Exp $";   #define IN_ROXEN   #include <roxen.h>   #include <config.h>
838:   mapping restart()   {    stop_all_modules(); -  call_out(fork_or_quit, 1); -  return ([ "data":Stdio.read_bytes("etc/restart.html"), "type":"text/html" ]); +  call_out(fork_or_quit, 5); +  return ([ "data": replace(Stdio.read_bytes("etc/restart.html"), +  ({"$docurl", "$PWD"}), ({roxen->docurl, getcwd()})), +  "type":"text/html" ]);   }      private array configuration_ports = ({ });
850:   // This has to be refined in some way. It is not all that nice to do   // it like this (write a file in /tmp, and then exit.) The major part   // of code to support this is in the 'start' script. - mapping shutdown() + void kill_me()   {    catch(Array.map(indices(portno)), destruct);   
886:   // kill(startpid, signum("SIGKILL"));    }    } + }    -  call_out(exit, 1, 0); -  return ([ "data":replace(Stdio.read_bytes("etc/shutdown.html"), "$PWD", getcwd()), + mapping shutdown() + { +  call_out(kill_me, 5, 0); +  return ([ "data":replace(Stdio.read_bytes("etc/shutdown.html"), +  ({"$docurl", "$PWD"}), ({roxen->docurl, getcwd()})),    "type":"text/html" ]);   }