cleanup

producer/event_monitor_producer/src/single_folder_watch_windows.cpp

@@ -14,7 +14,6 @@ SingleFolderWatch::SingleFolderWatch(std::string root_folder, std::string folder
            folder_{std::move(folder)},
 buffer_{new char[kBufLen]},
 event_list_{event_list}
-
 {
 }
 
@@ -43,7 +42,6 @@ Error SingleFolderWatch::Watch() {
         ProcessEvents(bytes_read);
     }
     return err;
-
 }
 
 Error SingleFolderWatch::ProcessEvent(const WinEvent& event) {
@@ -56,8 +54,6 @@ Error SingleFolderWatch::ProcessEvent(const WinEvent& event) {
     if (watch_io__->IsDirectory(root_folder_ + kPathSeparator + fname)) {
         return nullptr;
     }
-
-    event.Print();
     event_list_->AddEvent(fname, event.ShouldBeProcessedAfterDelay());
     return nullptr;
 }

producer/event_monitor_producer/src/system_folder_watch_linux.cpp

@@ -85,7 +85,6 @@ Error SystemFolderWatch::FindEventPaths(const InotifyEvent& event, std::string*
 }
 
 Error SystemFolderWatch::ProcessFileEvent(const InotifyEvent& event, FilesToSend* files) {
-    event.Print();
     if (!event.IsNewFileInFolderEvent()) {
         return nullptr;
     }

deploy/nomad_jobs/asapo-test.nmd → tests/manual/tests_via_nomad/asapo-test.nomad

 job "asapo-test" {
-  datacenters = ["dc1"]
+  datacenters = [
+    "dc1"]
 
   type = "batch"
 
-  group "windows-test" {
+  group "producer-windows" {
 
     constraint {
       attribute = "${attr.kernel.name}"
       value = "windows"
     }
 
-    count = 0
+    count = 1
     task "producer" {
       driver = "raw_exec"
 
@@ -41,96 +42,10 @@ job "asapo-test" {
       #        }
     }
 
-  } #windows
+  }
+  #windows
 
-  group "worker-linux1" {
-
-    constraint {
-      attribute = "${attr.kernel.name}"
-      value = "linux"
-    }
-
-#    constraint {
-#      attribute = "${meta.location}"
-#      operator = "!="
-#      value = "petra3"
-#    }
-
-    count = 1
-
-    task "worker-linux" {
-      driver = "raw_exec"
-
-      config {
-        command = "local/getnext_broker"
-        args = [
-          "psana002:8400",
-          "asapo_test1",
-          "16",
-          "oTsKsj8i6WcW_gVzeIFvZCtSfMErjDELJEyAI23n7Ik=",
-          "30000"]
-      }
-
-            resources {
-              cpu = 5000
-              memory = 128
-              network {
-                mbits = 10000
-              }
-	}
-
-      artifact {
-        source = "http://nims.desy.de/extra/asapo/getnext_broker"
-      }
-    }
-
-  } # worker-linux1
-
-
-group "worker-linux2" {
-
-    constraint {
-      attribute = "${attr.kernel.name}"
-      value = "linux"
-    }
-
-#    constraint {
-#      attribute = "${meta.location}"
-#      operator = "!="
-#      value = "petra3"
-#    }
-
-    count = 1
-
-    task "worker-linux" {
-      driver = "raw_exec"
-
-      config {
-        command = "local/getnext_broker"
-        args = [
-          "psana002:8400",
-          "asapo_test2",
-          "16",
-          "yzgAcLmijSLWIm8dBiGNCbc0i42u5HSm-zR6FRqo__Y=",
-          "30000"]
-      }
-            resources {
-              cpu = 5000
-              memory = 128
-              network {
-                mbits = 10000
-              }
-	    }
-
-      artifact {
-        source = "http://nims.desy.de/extra/asapo/getnext_broker"
-      }
-    }
-
-  } # worker-linux2
-
-
-  group "linux-test" {
+  group "producer-linux" {
 
     constraint {
       attribute = "${attr.kernel.name}"
@@ -173,5 +88,95 @@ group "worker-linux2" {
 
     }
 
-  } #linux
+  }
+  #linux
+}
+
+
+group "worker-linux1" {
+
+  constraint {
+    attribute = "${attr.kernel.name}"
+    value = "linux"
+  }
+
+  #    constraint {
+  #      attribute = "${meta.location}"
+  #      operator = "!="
+  #      value = "petra3"
+  #    }
+
+  count = 1
+
+  task "worker-linux" {
+    driver = "raw_exec"
+
+    config {
+      command = "local/getnext_broker"
+      args = [
+        "psana002:8400",
+        "asapo_test1",
+        "16",
+        "oTsKsj8i6WcW_gVzeIFvZCtSfMErjDELJEyAI23n7Ik=",
+        "30000"]
+    }
+
+    resources {
+      cpu = 5000
+      memory = 128
+      network {
+        mbits = 10000
+      }
+    }
+
+    artifact {
+      source = "http://nims.desy.de/extra/asapo/getnext_broker"
+    }
+  }
+
+}
+# worker-linux1
+
+
+group "worker-linux2" {
+
+  constraint {
+    attribute = "${attr.kernel.name}"
+    value = "linux"
+  }
+
+  #    constraint {
+  #      attribute = "${meta.location}"
+  #      operator = "!="
+  #      value = "petra3"
+  #    }
+
+  count = 1
+
+  task "worker-linux" {
+    driver = "raw_exec"
+
+    config {
+      command = "local/getnext_broker"
+      args = [
+        "psana002:8400",
+        "asapo_test2",
+        "16",
+        "yzgAcLmijSLWIm8dBiGNCbc0i42u5HSm-zR6FRqo__Y=",
+        "30000"]
+    }
+    resources {
+      cpu = 5000
+      memory = 128
+      network {
+        mbits = 10000
+      }
+    }
+
+    artifact {
+      source = "http://nims.desy.de/extra/asapo/getnext_broker"
+    }
+  }
+
 }
+# worker-linux2