From b59d9074993cac46d6c33803c0b850974c088cf0 Mon Sep 17 00:00:00 2001
From: Adam Chlipala <adamc@hcoop.net>
Date: Sat, 21 Apr 2007 15:44:36 +0000
Subject: [PATCH] Factor out log directory calculation code, in preparation for
 changing how it works

---
 src/plugins/apache.sig    |  2 ++
 src/plugins/apache.sml    | 50 ++++++++++++++-------------------------
 src/plugins/webalizer.sml |  6 +----
 3 files changed, 21 insertions(+), 37 deletions(-)

diff --git a/src/plugins/apache.sig b/src/plugins/apache.sig
index db9966c..a92edcf 100644
--- a/src/plugins/apache.sig
+++ b/src/plugins/apache.sig
@@ -29,4 +29,6 @@ signature APACHE = sig
     val registerAliaser : (string -> unit) -> unit
     (* Register a callback for an alternate hostname that is configured. *)
 
+    val logDir : {user : string, node : string, vhostId : string} -> string
+    (* Where is a vhost's log directory located? *)
 end
diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index 511901c..30bc4fd 100644
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -241,6 +241,13 @@ fun down () = if imVersion1 () then Config.Apache.down1 else Config.Apache.down
 fun undown () = if imVersion1 () then Config.Apache.undown1 else Config.Apache.undown
 fun reload () = if imVersion1 () then Config.Apache.reload1 else Config.Apache.reload
 
+fun logDir {user, node, vhostId} =
+    String.concat [Domain.homedirOf user,
+		   "/apache/log/",
+		   node,
+		   "/",
+		   vhostId]
+
 val () = Slave.registerFileHandler (fn fs =>
 				       let
 					   val spl = OS.Path.splitDirFile (#file fs)
@@ -259,27 +266,15 @@ val () = Slave.registerFileHandler (fn fs =>
 						       print ("Can't find user in " ^ #file fs ^ " or " ^ realVhostFile ^ "!  Taking no action.\n")
 						   else
 						       let
+							   val vhostId = if OS.Path.ext (#file spl) = SOME ".vhost_ssl" then
+									     OS.Path.base (#file spl) ^ ".ssl"
+									 else
+									     OS.Path.base (#file spl)
+
 							   fun realLogDir user =
-							       let
-								   val realLogDir = Domain.homedirOf (valOf user)
-								   val realLogDir = OS.Path.joinDirFile
-											{dir = realLogDir,
-											 file = "apache"}
-								   val realLogDir = OS.Path.joinDirFile
-											{dir = realLogDir,
-											 file = "log"}
-								   val realLogDir = OS.Path.joinDirFile
-											{dir = realLogDir,
-											 file = Slave.hostname ()}
-								   val {base, ...} = OS.Path.splitBaseExt (#file spl)
-
-								   val realLogDir = OS.Path.concat (realLogDir, base)
-							       in
-								   if String.isSuffix ".vhost_ssl" (#file spl) then
-								       realLogDir ^ ".ssl"
-								   else
-								       realLogDir
-							       end
+							       logDir {user = valOf user,
+								       node = Slave.hostname (),
+								       vhostId = vhostId}
 						       in
 							   vhostsChanged := true;
 							   case #action fs of
@@ -420,17 +415,9 @@ val () = Env.containerV_one "vhost"
 								  | NONE => "80");
 					   TextIO.output (file, ">\n");
 					   TextIO.output (file, "\tErrorLog ");
-					   TextIO.output (file, Domain.homedirOf user);
-					   TextIO.output (file, "/apache/log/");
-					   TextIO.output (file, node);
-					   TextIO.output (file, "/");
-					   TextIO.output (file, vhostId);
+					   TextIO.output (file, logDir {user = user, node = node, vhostId = vhostId});
 					   TextIO.output (file, "/error.log\n\tCustomLog ");
-					   TextIO.output (file, Domain.homedirOf user);
-					   TextIO.output (file, "/apache/log/");
-					   TextIO.output (file, node);
-					   TextIO.output (file, "/");
-					   TextIO.output (file, vhostId);
+					   TextIO.output (file, logDir {user = user, node = node, vhostId = vhostId});
 					   TextIO.output (file, "/access.log combined\n");
 					   TextIO.output (file, "\tServerName ");
 					   TextIO.output (file, fullHost);
@@ -454,8 +441,7 @@ val () = Env.containerV_one "vhost"
 						TextIO.output (file, user))
 					   else
 					       ();
-					   (Domain.homedirOf user ^ "/apache/log/"
-					    ^ node ^ "/" ^ vhostId, file)
+					   (logDir {user = user, node = node, vhostId = vhostId}, file)
 				       end)
 				   nodes;
 		 write "\n\tDocumentRoot ";
diff --git a/src/plugins/webalizer.sml b/src/plugins/webalizer.sml
index c6f8a17..3c15edc 100644
--- a/src/plugins/webalizer.sml
+++ b/src/plugins/webalizer.sml
@@ -32,11 +32,7 @@ val () = Apache.registerPre
 								   name = id ^ ".wbl"}
 				   in
 				       TextIO.output (fd, "LogFile\t");
-				       TextIO.output (fd, Domain.homedirOf user);
-				       TextIO.output (fd, "/apache/log/");
-				       TextIO.output (fd, node);
-				       TextIO.output (fd, "/");
-				       TextIO.output (fd, hostname);
+				       TextIO.output (fd, Apache.logDir {user = user, node = node, vhostId = hostname});
 				       TextIO.output (fd, "/access.log\nOutputDir\t");
 				       TextIO.output (fd, Config.Webalizer.outputDir);
 				       TextIO.output (fd, "/");
-- 
2.20.1