From 7f2c94e9cdf61b2770707895fc6bafd9aacf0764 Mon Sep 17 00:00:00 2001
From: Bob Jacobsen <jacobsen@mac.com>
Date: Thu, 27 Apr 2017 17:41:06 -0700
Subject: [PATCH] always start web server

---
 userfiles/shasta_common_startup.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/userfiles/shasta_common_startup.py b/userfiles/shasta_common_startup.py
index 5ec7e41..a13c004 100644
--- a/userfiles/shasta_common_startup.py
+++ b/userfiles/shasta_common_startup.py
@@ -5,9 +5,9 @@
 #
 
 import jmri
-
 cm = jmri.InstanceManager.getDefault(jmri.ConfigureManager)
 
+# allow substitutions from internal DTD
 execfile(jmri.util.FileUtil.getExternalFilename("program:jython/TurnOffXmlValidation.py"))
 
 cm.load(java.io.File(jmri.util.FileUtil.getExternalFilename("preference:FullConfig.xml")))
@@ -24,6 +24,7 @@
 cm.load(java.io.File(jmri.util.FileUtil.getExternalFilename("preference:OperatorPanel.xml")))
 cm.load(java.io.File(jmri.util.FileUtil.getExternalFilename("preference:TurntableControls.xml")))
 
+# start signal followers
 execfile(jmri.util.FileUtil.getExternalFilename("program:jython/SignalFollower.py"))
 SignalFollowerListener().set("CH2001","CH2001R")
 SignalFollowerListener().set("CH2002","CH2002R")
@@ -35,4 +36,7 @@
 execfile(jmri.util.FileUtil.getExternalFilename("preference:CtcDebugInit.py"))
 execfile(jmri.util.FileUtil.getExternalFilename("preference:SetCtcIndicators.py"))
 
+# start web server
+jmri.web.server.WebServerAction().actionPerformed(None)
+
 print "shasta_common_startup done"