From cedb32b6b7a799ef4142b418e64d3538cf604af1 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Thu, 5 Jun 2014 14:13:37 +0200 Subject: Recreate old Authenticator interface as 'ProxyLogin' Server boots with new lookup interface. --- src/main/java/com/c2kernel/process/Gateway.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/main/java/com/c2kernel/process/Gateway.java') diff --git a/src/main/java/com/c2kernel/process/Gateway.java b/src/main/java/com/c2kernel/process/Gateway.java index 0c97a77..af24fe2 100644 --- a/src/main/java/com/c2kernel/process/Gateway.java +++ b/src/main/java/com/c2kernel/process/Gateway.java @@ -136,9 +136,6 @@ public class Gateway Language.isTranlated=true; Language.mTableOfTranslation = FileStringUtility.loadLanguageFile(languageFile); } - - // if client, run module startup scripts. Otherwise bootstrap will do it after all imports - if (!AbstractMain.runningAsWrapper) mModules.runScripts("startup"); } /** @@ -215,7 +212,7 @@ public class Gateway } catch (Exception ex) { Logger.error(ex); - throw new InvalidDataException("Cannot authenticate. Name and/or password invalid.", ""); + throw new InvalidDataException("Cannot connect server process. Please check config.", ""); } @@ -250,6 +247,11 @@ public class Gateway AgentPath agentPath = mLookup.getAgentPath(agentName); AgentProxy userProxy = (AgentProxy) mProxyManager.getProxy(agentPath); userProxy.setAuthObj(auth); + + // Run module startup scripts. Server does this during bootstrap + mModules.setUser(userProxy); + mModules.runScripts("startup"); + return userProxy; } -- cgit v1.2.3