Roxen.git / server / base_server / configuration.pike

version» Context lines:

Roxen.git/server/base_server/configuration.pike:1:   // This file is part of Roxen WebServer.   // Copyright © 1996 - 2004, Roxen IS.   //      // @appears Configuration   //! A site's main configuration    - constant cvs_version = "$Id: configuration.pike,v 1.591 2005/06/29 18:53:47 grubba Exp $"; + constant cvs_version = "$Id: configuration.pike,v 1.592 2005/09/02 12:25:27 mast Exp $";   #include <module.h>   #include <module_constants.h>   #include <roxen.h>   #include <request_trace.h>   #include <timers.h>      #define CATCH(P,X) do{mixed e;if(e=catch{X;})report_error("While "+P+"\n"+describe_backtrace(e));}while(0)      // --- Locale defines ---   //<locale-token project="roxen_start"> LOC_S </locale-token>
Roxen.git/server/base_server/configuration.pike:3040:    // If this is a faked module, let's call it a failure.    if( nm->not_a_module )    {    old_module->report_error(LOC_C(385,"Reload failed")+"\n");    return old_module;    }       disable_module( modname, 1 );    destruct( old_module );    +  mixed err = catch {    mi->update_with( nm,0 ); // This is sort of nessesary... -  +  }; +  if (err) +  if (stringp (err)) { +  // Error from the register_module call. We can't enable the old +  // module now, and I don't dare changing the order so that +  // register_module starts to get called before the old module is +  // destructed. /mast +  report_error (err); +  report_error(LOC_C(385,"Reload failed")+"\n"); +  return 0; // Use a placeholder module instead? +  } +  else +  throw (err);    enable_module( modname, nm, mi );       foreach (old_error_log, [string msg, array(int) times])    nm->error_log[msg] += times;       nm->report_notice(LOC_C(11, "Reloaded %s.")+"\n", mi->get_name());    return nm;   }      #ifdef THREADS