Roxen.git/ server/ base_server/ configuration.pike

1999-12-28

1999-12-28 00:00:17 by Martin Stjernholm <mast@lysator.liu.se>

• 6958014b35529ffc519d3ab4d2b75e73dfd7713f (19 lines) (+10/-9) ^{[ Show | Annotate ]}
  Branch: 5.2

Reverted (most of) last change; seems like it's intentional. Hmm..

Rev: server/base_server/configuration.pike:1.246

3:    * (C) 1996, 1999 Idonex AB.    */    - constant cvs_version = "$Id: configuration.pike,v 1.245 1999/12/27 20:36:02 mast Exp $"; + constant cvs_version = "$Id: configuration.pike,v 1.246 1999/12/28 00:00:17 mast Exp $";   constant is_configuration = 1;   #include <module.h>   #include <roxen.h>
2869:   {    enabled_modules = retrieve("EnabledModules", this_object());    +  object ec = roxenloader.LowErrorContainer(); +  roxenloader.push_compile_error_handler( ec ); +     array modules_to_process = indices( enabled_modules );    string tmp_string;   
2887:    forcibly_added = (<>);    foreach( modules_to_process, tmp_string )    { -  if( !forcibly_added[ tmp_string ] ) { -  object ec = roxenloader.LowErrorContainer(); -  roxenloader.push_compile_error_handler( ec ); +  if( !forcibly_added[ tmp_string ] )    if(err = catch( enable_module( tmp_string )))    report_error(LOCALE->enable_module_failed(tmp_string,    describe_backtrace(err))); -  +  }    roxenloader.pop_compile_error_handler();    if( strlen( ec->get() ) ) -  report_error( "While enabling module "+tmp_string+":\n"+ec->get() ); -  } -  } +  report_error( "While enabling modules in "+name+":\n"+ec->get() );    report_notice("All modules for %s enabled in %3.1f seconds\n\n",    query_name(),(gethrtime()-start_time)/1000000.0);   }