SP-824 / BIS-518 : Logs - improve logging of service calls

SVN: 29682

common/source/java/ch/systemsx/cisd/common/filesystem/control/ControlDirectoryEventFeed.java

@@ -43,6 +43,11 @@ public class ControlDirectoryEventFeed implements IEventFeed
     {
         List<String> events = new ArrayList<String>();
 
+        if (controlDir.exists() == false || controlDir.isDirectory() == false)
+        {
+            return events;
+        }
+
         List<File> files = Arrays.asList(controlDir.listFiles());
 
         Collections.sort(files, new Comparator<File>()

openbis-common/source/java/ch/systemsx/cisd/openbis/common/controlfile/ControlFileReader.java

@@ -18,8 +18,8 @@ package ch.systemsx.cisd.openbis.common.controlfile;
 
 import java.io.File;
 
+import ch.systemsx.cisd.common.filesystem.control.ControlDirectoryEventFeed;
 import ch.systemsx.cisd.common.filesystem.control.DelayingDecorator;
-import ch.systemsx.cisd.common.filesystem.control.FileSystemBasedEventProvider;
 import ch.systemsx.cisd.common.filesystem.control.IValueFilter;
 import ch.systemsx.cisd.common.filesystem.control.ParameterMap;
 
@@ -49,7 +49,7 @@ public class ControlFileReader
     public ControlFileReader(File controlFileDirectory, long controlFileMaxDelay)
     {
         parameterMap =
-                new ParameterMap(new DelayingDecorator(controlFileMaxDelay, new FileSystemBasedEventProvider(controlFileDirectory)));
+                new ParameterMap(new DelayingDecorator(controlFileMaxDelay, new ControlDirectoryEventFeed(controlFileDirectory)));
         parameterMap.addParameter(LOG_SERVICE_CALL_START, OFF, new IValueFilter()
             {
 

openbis-common/sourceTest/java/ch/systemsx/cisd/openbis/common/controlfile/ControlFileReaderTest.java

@@ -47,7 +47,7 @@ public class ControlFileReaderTest
     }
 
     @Test
-    public void test() throws IOException
+    public void testSwitchOnAndOff() throws IOException
     {
         ControlFileReader reader = new ControlFileReader(getControlFileDirectory(), -1);
         Assert.assertFalse(reader.isLogServiceCallStartEnabled());
@@ -59,6 +59,19 @@ public class ControlFileReaderTest
         Assert.assertFalse(reader.isLogServiceCallStartEnabled());
     }
 
+    @Test
+    public void testWithNotExistingControlFileDirectory() throws IOException
+    {
+        ControlFileReader reader = new ControlFileReader(new File(getControlFileDirectory(), "notExisting"), -1);
+        Assert.assertFalse(reader.isLogServiceCallStartEnabled());
+
+        new File(getControlFileDirectory(), "log-service-call-start-on").createNewFile();
+        Assert.assertFalse(reader.isLogServiceCallStartEnabled());
+
+        new File(getControlFileDirectory(), "log-service-call-start-off").createNewFile();
+        Assert.assertFalse(reader.isLogServiceCallStartEnabled());
+    }
+
     private File getControlFileDirectory()
     {
         TestResources resources = new TestResources(getClass());