Roxen.git/ server/ base_server/ roxen.pike

2015-12-03

2015-12-03 11:20:18 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• bddc99974a57649a6e6bb3450c14fa05a8043ecc (13 lines) (+7/-6) ^{[ Show | Annotate ]}
  Branch: bddc99974a57649a6e6bb3450c14fa05a8043ecc

RoxenPatch: Added control of patch installation to the restart action.

It is now possible to override the "Automatically apply patches" setting
in the restart action as well as see how many patches that are pending
installation.

Fixes remainder of [bug 7602 (#7602)].

509:   // Shutdown Roxen   // exit_code = 0 True shutdown   // exit_code = -1 Restart - private void low_shutdown(int exit_code) + private void low_shutdown(int exit_code, int|void apply_patches)   {    if(shutdown_recurse >= 4)    {
537:    slow_be_timeout_changed();   #endif    -  if (query("patch_on_restart")) { +  if ((apply_patches || query("patch_on_restart")) > 0) {    mixed err = catch {    foreach(plib->file_list_imported(), mapping(string:mixed) item) {    report_notice("Applying patch %s...\n", item->metadata->id);
575:   // Perhaps somewhat misnamed, really... This function will close all   // listen ports and then quit. The 'start' script should then start a   // new copy of roxen automatically. - void restart(float|void i, void|int exit_code) + void restart(float|void i, void|int exit_code, void|int apply_patches)   //! Restart roxen, if the start script is running   {    shutdown_started = 1; -  call_out(low_shutdown, i, exit_code || -1); +  call_out(low_shutdown, i, exit_code || -1, apply_patches);   }    - void shutdown(float|void i) + void shutdown(float|void i, void|int apply_patches)   //! Shut down roxen   {    shutdown_started = 1; -  call_out(low_shutdown, i, 0); +  call_out(low_shutdown, i, 0, apply_patches);   }      void exit_when_done()