ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject [04/14] ignite git commit: IGNITE-2875 WIP
Date Thu, 31 Mar 2016 07:27:42 GMT
IGNITE-2875 WIP


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7b162cd2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7b162cd2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7b162cd2

Branch: refs/heads/ignite-2875
Commit: 7b162cd28e2b7a85253f49e59aeb40847ccbe284
Parents: ca6c0cb
Author: Andrey <anovikov@gridgain.com>
Authored: Tue Mar 29 16:03:01 2016 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Tue Mar 29 16:03:01 2016 +0700

----------------------------------------------------------------------
 .../src/main/js/serve/agent.js                  | 22 ++++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/7b162cd2/modules/control-center-web/src/main/js/serve/agent.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/agent.js b/modules/control-center-web/src/main/js/serve/agent.js
index d6a195d..11d4292 100644
--- a/modules/control-center-web/src/main/js/serve/agent.js
+++ b/modules/control-center-web/src/main/js/serve/agent.js
@@ -143,13 +143,13 @@ module.exports.factory = function(_, ws, fs, path, JSZip, socketio,
settings, mo
                 params[param.key] = param.value;
 
             return new Promise((resolve, reject) => {
-                this._emit('node:rest', {uri: 'ignite', params, demo: cmd._demo, method:
'GET'}, (error, restResult) => {
+                this._emit('node:rest', {uri: 'ignite', params, demo: cmd._demo, method:
'GET'}, (error, res) => {
                     if (error)
                         return reject(new Error(error));
 
-                    error = restResult.error;
+                    error = res.error;
 
-                    const code = restResult.code;
+                    const code = res.code;
 
                     if (code === 401)
                         return reject(Error('Failed to authenticate on node.', 2));
@@ -158,12 +158,12 @@ module.exports.factory = function(_, ws, fs, path, JSZip, socketio,
settings, mo
                         return reject(new Error(error || 'Failed connect to node and execute
REST command.'));
 
                     try {
-                        const response = JSON.parse(restResult.data);
+                        const msg = JSON.parse(res.data);
 
-                        if (response.successStatus === 0)
-                            return resolve(response.response);
+                        if (msg.successStatus === 0)
+                            return resolve(msg.response);
 
-                        reject(new Error(response.error, response.successStatus));
+                        reject(new Error(msg.error, msg.successStatus));
                     }
                     catch (e) {
                         return reject(e);
@@ -184,16 +184,16 @@ module.exports.factory = function(_, ws, fs, path, JSZip, socketio,
settings, mo
         }
 
         /**
-         * @param {String} driverPath
-         * @param {String} driverClass
+         * @param {String} drvPath
+         * @param {String} drvClass
          * @param {String} url
          * @param {Object} info
          * @param {Array} schemas
          * @param {Boolean} tablesOnly
          * @returns {Promise} Promise on list of tables (see org.apache.ignite.schema.parser.DbTable
java class)
          */
-        metadataTables(driverPath, driverClass, url, info, schemas, tablesOnly) {
-            return this.executeAgent('schemaImport:metadata', {driverPath, driverClass, url,
info, schemas, tablesOnly});
+        metadataTables(drvPath, drvClass, url, info, schemas, tablesOnly) {
+            return this.executeAgent('schemaImport:metadata', {drvPath, drvClass, url, info,
schemas, tablesOnly});
         }
 
         /**


Mime
View raw message