Commit 887cb712eccbdb2d37abde37f80ea5e6878e5a14
Merge branch 'master' of github.com:ashvayka/thingsboard
Showing
2 changed files
with
3 additions
and
10 deletions
... | ... | @@ -21,7 +21,7 @@ export default angular.module('thingsboard.api.telemetryWebsocket', [thingsboard |
21 | 21 | .name; |
22 | 22 | |
23 | 23 | /*@ngInject*/ |
24 | -function TelemetryWebsocketService($log, $websocket, $timeout, $window, types, userService) { | |
24 | +function TelemetryWebsocketService($websocket, $timeout, $window, types, userService) { | |
25 | 25 | |
26 | 26 | var isOpening = false, |
27 | 27 | isOpened = false, |
... | ... | @@ -57,9 +57,7 @@ function TelemetryWebsocketService($log, $websocket, $timeout, $window, types, u |
57 | 57 | if (isOpened && (cmdsWrapper.tsSubCmds.length > 0 || |
58 | 58 | cmdsWrapper.historyCmds.length > 0 || |
59 | 59 | cmdsWrapper.attrSubCmds.length > 0)) { |
60 | - $log.debug("Sending subscription commands!"); | |
61 | 60 | dataStream.send(angular.copy(cmdsWrapper)).then(function () { |
62 | - $log.debug("Subscription commands were sent!"); | |
63 | 61 | checkToClose(); |
64 | 62 | }); |
65 | 63 | cmdsWrapper.tsSubCmds = []; |
... | ... | @@ -69,21 +67,17 @@ function TelemetryWebsocketService($log, $websocket, $timeout, $window, types, u |
69 | 67 | tryOpenSocket(); |
70 | 68 | } |
71 | 69 | |
72 | - function onError (message) { | |
73 | - $log.debug("Websocket error:"); | |
74 | - $log.debug(message); | |
70 | + function onError (/*message*/) { | |
75 | 71 | isOpening = false; |
76 | 72 | } |
77 | 73 | |
78 | 74 | function onOpen () { |
79 | - $log.debug("Websocket opened"); | |
80 | 75 | isOpening = false; |
81 | 76 | isOpened = true; |
82 | 77 | publishCommands(); |
83 | 78 | } |
84 | 79 | |
85 | 80 | function onClose () { |
86 | - $log.debug("Websocket closed"); | |
87 | 81 | isOpening = false; |
88 | 82 | isOpened = false; |
89 | 83 | } | ... | ... |
... | ... | @@ -46,8 +46,7 @@ var pluginActionsClazzHelpLinkMap = { |
46 | 46 | 'org.thingsboard.server.extensions.rest.action.RestApiCallPluginAction': 'pluginActionRestApiCall' |
47 | 47 | }; |
48 | 48 | |
49 | -//var helpBaseUrl = "http://thingsboard.io"; | |
50 | -var helpBaseUrl = "http://localhost:4000"; | |
49 | +var helpBaseUrl = "http://thingsboard.io"; | |
51 | 50 | |
52 | 51 | export default angular.module('thingsboard.help', []) |
53 | 52 | .constant('helpLinks', | ... | ... |