Re-organised startup a bit. Now HTTP_Startup is a group.

HTTP_Startup has three things scheduled in it, in order:

  HTTP_StartServer

    which starts the web-server

  GROUP HTTP_SetupPages

    which can be used by anything which needs to know the location of
    the webserver before the webserver starts listening

  HTTP_FirstServ

    which listens for connections and may sit there if httpd::pause is
    true.


The reason for this cahnge is that I need to advertise the location of the
webserver, but then have Cactus sitting in pause mode, and the old logic
didn't allow this.

Hopefully by not chaning the name of HTTP_Startup no existing code should
be affected.

Tom


git-svn-id: http://svn.cactuscode.org/arrangements/CactusConnect/HTTPD/trunk@175 1faa4e14-9dd3-4be0-9f0e-ffe519881164

1 files changed, 18 insertions, 4 deletions

diff --git a/schedule.ccl b/schedule.ccl
index a6c787e..674319b 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -1,22 +1,36 @@
 # Schedule definitions for thorn httpd
 # $Header$
 
-SCHEDULE HTTP_Startup AT startup
+SCHEDULE GROUP HTTP_Startup AT startup
 {
   LANG: C
-} "HTTP daemon startup"
+} "HTTP daemon startup group"
+
+SCHEDULE HTTP_StartServer in HTTP_Startup
+{
+  LANG: C
+} "Start HTTP server"
+
+SCHEDULE GROUP HTTP_SetupPages in HTTP_Startup AFTER HTTP_StartServer
+{
+} "Group to setup stuff which needs to be done between starting the server and the first time it serves pages"
+
+SCHEDULE HTTP_FirstServ in HTTP_Startup AFTER HTTP_SetupPages
+{
+  LANG: C
+} "Serve first pages at startup"
 
 SCHEDULE HTTP_Work AT poststep BEFORE IOUtil_UpdateParFile
 {
   LANG: C
-} "HTTP working routine"
+} "Working routine"
 
 if(provide_pages)
 {
   SCHEDULE HTTP_ContentWork AT poststep
   {
     LANG: C
-  } "HTTP Content Working routine"
+  } "Content Working routine"
 }
 
 SCHEDULE HTTP_Shutdown AT shutdown