From fb7c48416dcf0a39c660956626a045c1c6f2f0cb Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Fri, 12 Dec 2003 11:36:26 +0000
Subject: [PATCH] Always set helma.logdir when using helma logging, even when
 logdir is set to console. Disable checkRunning() because of connection
 timeout problems.

---
 src/helma/main/Server.java | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/helma/main/Server.java b/src/helma/main/Server.java
index d49bf5de..63cd12a1 100644
--- a/src/helma/main/Server.java
+++ b/src/helma/main/Server.java
@@ -591,23 +591,26 @@ public class Server implements IPathElement, Runnable {
      */
     public static Log getLogger() {
         if (logger == null) {
-            // get the logDir property
-            String logDir = sysProps.getProperty("logdir", "log");
+            if (helmaLogging) {
+                // set up system properties for helma.util.Logging
+                String logDir = sysProps.getProperty("logdir", "log");
+
+                if (!"console".equals(logDir)) {
+                    // try to get the absolute logdir path
 
-            if ("console".equals(logDir)) {
-                logger = Logging.getConsoleLog();
-            } else {
-                if (helmaLogging) {
                     // set up helma.logdir system property
                     File dir = new File(logDir);
                     if (!dir.isAbsolute()) {
                         dir = new File(hopHome, logDir);
                     }
-                    System.setProperty("helma.logdir", dir.getAbsolutePath());
+                    
+                    logDir = dir.getAbsolutePath();
                 }
-                logger = LogFactory.getLog("helma.server");
+                System.setProperty("helma.logdir", logDir);
             }
+            logger = LogFactory.getLog("helma.server");
         }
+
         return logger;
     }
 
@@ -636,6 +639,11 @@ public class Server implements IPathElement, Runnable {
      *  A primitive method to check whether a server is already running on our port.
      */
     private void checkRunning(InetAddrPort addrPort) throws Exception {
+        // checkRunning is disabled until we find a fix for the socket creation
+        // timeout problems reported on the list.
+        return;
+
+        /*
         InetAddress addr = addrPort.getInetAddress();
         if (addr == null) {
             try {
@@ -655,6 +663,7 @@ public class Server implements IPathElement, Runnable {
 
         // if we got so far, another server is already running on this port and db
         throw new Exception("Error: Server already running on this port: " + addrPort);
+        */
     }
 
     /**