[caudium-commits] [caudium commit] r9321 - in trunk/caudium/server: base_serveretc/modules/Caudium.pmod etc/upgrade.d/1.5.0

[codesite-noreply AT google.com]

Author: bill.welliver
Date: Tue Jul  1 15:25:58 2008
New Revision: 9321

Modified:
  trunk/caudium/server/base_server/caudium.pike
  trunk/caudium/server/base_server/read_config.pike
  trunk/caudium/server/etc/modules/Caudium.pmod/UpgradeTask.pike
  trunk/caudium/server/etc/upgrade.d/1.5.0/config_interface.pike

Log:
upgrade works properly now, and the config interface is
generated.


Modified: trunk/caudium/server/base_server/caudium.pike
==============================================================================
--- trunk/caudium/server/base_server/caudium.pike       (original)
+++ trunk/caudium/server/base_server/caudium.pike       Tue Jul  1 15:25:58 
2008
@@ -2438,6 +2438,8 @@
{
  int p;

+  globvar("upgrade_performed", 0, "Upgrade Performed? (DEPRECATED)",  
TYPE_FLAG|VAR_MORE, "");
+
  globvar("upgrade_version", 0, "Upgraded Version", TYPE_STRING|VAR_MORE,
        "Contains the version of Caudium last run. On startup, Caudium will "
        "check this value to see if additional upgrade steps are necessary.");
@@ -3487,17 +3489,14 @@
void check_perform_upgrade()
{
  string v;
-  mixed e=catch(GLOBVAR(upgrade_version));
-  if(e && !catch(GLOBVAR(upgrade_performed)))
-  {
-    v = "1.4.999";
-  }
-  else if(e)
+  mixed e=catch(v = GLOBVAR(upgrade_version));
+  if(e || !v)
  {
-    v = "1.3.999";
+    if(GLOBVAR(upgrade_performed))
+      v = "1.4.999";
+    else
+      v = "1.3.999";
  }
-  else v = GLOBVAR(upgrade_version);
-
  if(v)
    do_perform_upgrade(v);
}
@@ -3511,7 +3510,7 @@
   foreach(uc;;string dir)
   {
     Stdio.Stat fs = file_stat(combine_path("etc/upgrade.d", dir));
-     if(!fs->isdir || Array.oid_sort_func(version, ver) || version == ver)
+     if(!fs->isdir || Array.oid_sort_func(version, dir) || version == dir)
     {
        // either we're not a directory, or
        // we've already performed upgrades to this release
@@ -3524,20 +3523,17 @@

   foreach(uc;; string ver)
   {
-     else
-     {
-       do_perform_upgrade_version(ver);
-     }
+     do_perform_upgrade_version(ver);
   }

   // if we get to the end, we should be at the current release.
   set("upgrade_version", __caudium_version__ + "." + __caudium_build__);
-
+   store("Variables", variables, 0, 0);
}

void do_perform_upgrade_version(string version)
{
-  report_info("Performing upgrade to version " + version + ".");
+  report_notice("Performing upgrade to version " + version + ".\n");
   string ud = combine_path("etc/upgrade.d" , version);
   array uc = get_dir(ud);
   if(uc) uc=glob("*.pike", uc);
@@ -3554,6 +3550,7 @@
   }

   set("upgrade_version", version);
+   store("Variables", variables, 0, 0);
}

void|string diagnose_error(array from)

Modified: trunk/caudium/server/base_server/read_config.pike
==============================================================================
--- trunk/caudium/server/base_server/read_config.pike   (original)
+++ trunk/caudium/server/base_server/read_config.pike	Tue Jul  1 
15:25:58 2008
@@ -135,7 +135,7 @@
void save_it(string cl)
{
  if (!configs[cl]) {
-    report_error("Config '%s' does not exist while trying to save.\n");
+    report_error("Config '%s' does not exist while trying to save.\n", cl);
    return;
  }

@@ -204,7 +204,7 @@
}

//!
-array config_is_modified(string cl)
+Stdio.Stat config_is_modified(string cl)
{
  Stdio.Stat st = file_stat(configuration_dir + replace(cl, " ", "_"));


Modified: trunk/caudium/server/etc/modules/Caudium.pmod/UpgradeTask.pike
==============================================================================
--- trunk/caudium/server/etc/modules/Caudium.pmod/UpgradeTask.pike      
(original)
+++ trunk/caudium/server/etc/modules/Caudium.pmod/UpgradeTask.pike	Tue 
Jul  1 15:25:58 2008
@@ -11,8 +11,9 @@
    foreach(caudium->configurations, object config)
    {
       report_notice("Upgrading virtual server configuration " + 
config->name + "...\n");
-       if(!upgrade_configuration())
-         report_error("Upgrade " + codefile + "  failed for 
configuration " + config->name + "\n");
+       if(!upgrade_configuration(config))
+         report_error("Upgrade " + sprintf("%O", this) + "  failed for 
configuration "
+           + config->name + "\n");
    }
  }


Modified: trunk/caudium/server/etc/upgrade.d/1.5.0/config_interface.pike
==============================================================================
--- trunk/caudium/server/etc/upgrade.d/1.5.0/config_interface.pike      
(original)
+++ trunk/caudium/server/etc/upgrade.d/1.5.0/config_interface.pike	Tue 
Jul  1 15:25:58 2008
@@ -1,9 +1,10 @@

// upgrade configuration interface to be a virtual server

-#include <module.h>
inherit Caudium.UpgradeTask;

+#define GLOBVAR(X) caudium->retrieve("Variables", 0)[X]
+
// some support functionality
class dummyConfig(string name)
{}
@@ -24,25 +25,34 @@
  // continue.
  foreach(caudium->configurations;; object c)
  {
-    if(c->name == "ConfigurationInterface") return;
+    if(c->name == "ConfigurationInterface") return 1;
  }

-   setconfigvar("spider#0", "Ports", GLOBVAR(ConfigPorts));
-   setconfigvar("spider#0", "MyWorldLocation", GLOBVAR(ConfigurationURL));
+   setconfigvar("spider#0", "Ports", GLOBVAR("ConfigPorts"));
+   setconfigvar("spider#0", "MyWorldLocation", GLOBVAR("ConfigurationURL"));
   setconfigvar("spider#0", "name", "Configuration Interface");
   setconfigvar("spider#0", "netcraft_done", 1);
   setconfigvar("filesystem#0", "mountpoint", "/config_interface");
   setconfigvar("filesystem#0", "searchpath", "config_interface");
   setconfigvar("configure#0", "mountpoint", "/");
   setconfigvar("auth_master#0", "name", "Master Authentication Handler");
-   setconfigvar("auth_configdefault#0", "username", 
GLOBVAR(ConfigurationUser));
-   setconfigvar("auth_configdefault#0", "password", 
GLOBVAR(ConfigurationPassword));
+   setconfigvar("auth_configdefault#0", "username", 
GLOBVAR("ConfigurationUser"));
+   setconfigvar("auth_configdefault#0", "password", 
GLOBVAR("ConfigurationPassword"));
   setconfigvar("EnabledModules", "configure#0", 1);
   setconfigvar("EnabledModules", "auth_master#0", 1);
   setconfigvar("EnabledModules", "auth_configdefault#0", 1);
   setconfigvar("EnabledModules", "filesystem#0", 1);

+
+   mapping v = caudium->retrieve("Variables", 0);
+
+   m_delete(v, "ConfigPorts");
+   m_delete(v, "ConfigurationUser");
+   m_delete(v, "ConfigurationPassword");
+
+
   caudium->save_it("ConfigurationInterface");
+   caudium->save_it("Global Variables");

  return 1;
}