From 57dee70f0785f1d9e0c65036afc18411dd22faa4 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Mon, 4 Feb 2013 22:09:38 +0100 Subject: Move server startup script execution to the end of the item registration for that module. --- src/main/java/com/c2kernel/process/Gateway.java | 4 ++-- src/main/java/com/c2kernel/process/module/ModuleManager.java | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/c2kernel/process/Gateway.java b/src/main/java/com/c2kernel/process/Gateway.java index a75c2c9..1bb451d 100644 --- a/src/main/java/com/c2kernel/process/Gateway.java +++ b/src/main/java/com/c2kernel/process/Gateway.java @@ -115,8 +115,8 @@ public class Gateway Language.mTableOfTranslation = FileStringUtility.loadLanguageFile(languageFile); } - // run module startup scripts - mModules.runScripts("startup"); + // if client, run module startup scripts. Otherwise bootstrap will do it after all imports + if (!isServer) mModules.runScripts("startup"); } /** diff --git a/src/main/java/com/c2kernel/process/module/ModuleManager.java b/src/main/java/com/c2kernel/process/module/ModuleManager.java index 4ff67f7..0e96486 100644 --- a/src/main/java/com/c2kernel/process/module/ModuleManager.java +++ b/src/main/java/com/c2kernel/process/module/ModuleManager.java @@ -148,10 +148,17 @@ public class ModuleManager { thisMod.importAll(serverEntity, modulesXML.get(thisMod.ns)); } catch (Exception e) { Logger.error(e); - throw new ModuleException("Error importing Module items"); + throw new ModuleException("Error importing items for module "+thisMod.getName()); } Logger.msg("Module "+thisMod.getName()+" registered"); + try { + thisMod.runScript("startup", true); + } catch (ScriptingEngineException e) { + Logger.error(e); + throw new ModuleException("Error in startup script for module "+thisMod.getName()); + } + } } -- cgit v1.2.3