Roxen.git/ server/ base_server/ roxen.pike

1998-10-15

1998-10-15 20:22:11 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 59912fe23e3b16b0869eaeca009c0abfecb6ec64 (24 lines) (+16/-8) ^{[ Show | Annotate ]}
  Branch: 5.2

Swapped the meanings of SIGTERM and SIGINT.

Rev: server/base_server/roxen.pike:1.247

1:   /* -  * $Id: roxen.pike,v 1.246 1998/10/12 22:54:16 per Exp $ +  * $Id: roxen.pike,v 1.247 1998/10/15 20:22:11 grubba Exp $    *    * The Roxen Challenger main program.    *
8:      // ABS and suicide systems contributed freely by Francesco Chemolli    - constant cvs_version="$Id: roxen.pike,v 1.246 1998/10/12 22:54:16 per Exp $"; + constant cvs_version="$Id: roxen.pike,v 1.247 1998/10/15 20:22:11 grubba Exp $";         // Some headerfiles
58:   int startpid, roxenpid;      // Locale support - object locale = Locale.Roxen.svenska; - #define LOCALE locale->base_server + object(Locale.Roxen.standard) default_locale = Locale.Roxen.svenska; //standard; + #ifdef THREADS + object locale = thread_local(); + #else + object(Locale.Roxen.standard) locale = default_locale; + #endif /* THREADS */ + #define LOCALE LOW_LOCALE->base_server    -  +    program Configuration; /*set in create*/      array configurations = ({});
318:    array (mixed) h, q;    while(1)    { +  SET_LOCALE(default_locale);    if(q=catch {    do {    if((h=handle_queue->read()) && h[0]) {
933:   }       -  +    int config_ports_changed = 0;      static string MKPORTKEY(array(string) p)
1090:      void create()   { +  SET_LOCALE(default_locale); +     catch    {    module_stat_cache = decode_value(Stdio.read_bytes(".module_stat_cache"));
2226:   // Roxen :) It has not changed all that much since Spider 2.0.   int main(int|void argc, array (string)|void argv)   { +  SET_LOCALE(default_locale);    initiate_languages();    mixed tmp;   
2299:   #endif /* THREADS */       // Signals which cause a restart (exitcode != 0) -  foreach( ({ "SIGUSR1", "SIGUSR2", "SIGINT" }), string sig) { +  foreach( ({ "SIGUSR1", "SIGUSR2", "SIGTERM" }), string sig) {    catch { signal(signum(sig), exit_when_done); };    }    catch { signal(signum("SIGHUP"), reload_all_configurations); };    // Signals which cause a shutdown (exitcode == 0) -  foreach( ({ "SIGTERM" }), string sig) { +  foreach( ({ "SIGINT" }), string sig) {    catch { signal(signum(sig), shutdown); };    }