projects
/
contrib
/
cloudeebus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #27 from fpaut/master
[contrib/cloudeebus.git]
/
cloudeebus
/
cloudeebus.js
diff --git
a/cloudeebus/cloudeebus.js
b/cloudeebus/cloudeebus.js
index
08528eb
..
92d3108
100644
(file)
--- a/
cloudeebus/cloudeebus.js
+++ b/
cloudeebus/cloudeebus.js
@@
-46,7
+46,7
@@
cloudeebus.log = function(msg) {
cloudeebus.getError = function(error) {
if (error.desc && error.uri)
cloudeebus.getError = function(error) {
if (error.desc && error.uri)
- return error.desc + " : " + error.uri;
+ return error.desc + " : " + error.uri;
// error cloudeebus (from python)
if (error.desc)
return error.desc;
if (error.uri)
if (error.desc)
return error.desc;
if (error.uri)
@@
-57,7
+57,7
@@
cloudeebus.getError = function(error) {
return error.message;
if (error.name)
return error.name;
return error.message;
if (error.name)
return error.name;
- return error;
+ return error;
// error from Autobahn
};
cloudeebus.versionCheck = function(version) {
};
cloudeebus.versionCheck = function(version) {
@@
-176,7
+176,7
@@
cloudeebus.BusConnection.prototype.addService = function(serviceName) {
var cloudeebusService = new cloudeebus.Service(self.wampSession, self, serviceName);
function ServiceAddedSuccessCB(serviceName) {
var cloudeebusService = new cloudeebus.Service(self.wampSession, self, serviceName);
function ServiceAddedSuccessCB(serviceName) {
- try {
// calling dbus hook object function for un-translated types
+ try {
cloudeebusService.isCreated = true;
resolver.fulfill(cloudeebusService, true);
}
cloudeebusService.isCreated = true;
resolver.fulfill(cloudeebusService, true);
}
@@
-378,8
+378,7
@@
cloudeebus.Service.prototype.addAgent = function(agent) {
try { // calling dbus hook object function for un-translated types
self.agents.push(agent);
agent.registered = true;
try { // calling dbus hook object function for un-translated types
self.agents.push(agent);
agent.registered = true;
- var result = [ objPath ];
- resolver.fulfill(result[0], true);
+ resolver.fulfill(objPath, true);
}
catch (e) {
var errorStr = cloudeebus.getError(e);
}
catch (e) {
var errorStr = cloudeebus.getError(e);
@@
-435,16
+434,15
@@
cloudeebus.Service.prototype._deleteWrapper = function(agent) {
};
};
-cloudeebus.Service.prototype.removeAgent = function(rmAgent
, successCB, errorCB
) {
+cloudeebus.Service.prototype.removeAgent = function(rmAgent) {
var self = this;
var promise = new cloudeebus.Promise(function (resolver) {
function ServiceRemoveAgentSuccessCB(agent) {
try { // calling dbus hook object function for un-translated types
var self = this;
var promise = new cloudeebus.Promise(function (resolver) {
function ServiceRemoveAgentSuccessCB(agent) {
try { // calling dbus hook object function for un-translated types
- self.agents.push(agent);
- agent.registered = true;
- var result = [ agent ];
- resolver.fulfill(result[0], true);
+ self.agents.pop(agent);
+ agent.registered = false;
+ resolver.fulfill(agent, true);
}
catch (e) {
var errorStr = cloudeebus.getError(e);
}
catch (e) {
var errorStr = cloudeebus.getError(e);