Merge pull request #2 from dudyk/reregister

Reregister existing framework and support escape of slash in task names
tobilg · Dec 1, 2016 · 3b74c66 · 3b74c66
2 parents 634374a + ba519a8
commit 3b74c66
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/scheduler.js b/lib/scheduler.js
@@ -284,6 +284,11 @@ Scheduler.prototype.subscribe = function () {
 
             }
 
+        } else {
+            res.on("data",function (chunk) {
+                if (chunk.length > 0)
+                    self.logger.error("Error registering with mesos: " + chunk.toString());
+            });
         }
 
     });
@@ -353,7 +358,8 @@ Scheduler.prototype.subscribe = function () {
     self.logger.info("SUBSCRIBE: " + JSON.stringify(Subscribe));
 
     // Set the Call object
-    var Call = helpers.stringifyEnumsRecursive(new mesos.scheduler.Call(null, "SUBSCRIBE", Subscribe));
+    var Call = helpers.stringifyEnumsRecursive(new mesos.scheduler.Call(
+        self.frameworkId ? new mesos.FrameworkID(self.frameworkId) : null, "SUBSCRIBE", Subscribe));
 
     // Write data to request body
     self.request.write(JSON.stringify(Call));

diff --git a/lib/schedulerHandlers.js b/lib/schedulerHandlers.js
@@ -167,7 +167,7 @@ module.exports = {
                     self.logger.debug("commandInfo after adding network info: " + JSON.stringify(helpers.stringifyEnumsRecursive(task.commandInfo)));
 
                     // Get unique taskId
-                    var taskId = self.options.frameworkName + "." + task.name + "." + uuid.v4();
+                    var taskId = self.options.frameworkName + "." + task.name.replace(/\//, "_") + "." + uuid.v4();
 
                     // Set taskId
                     task.taskId = taskId;