From ee374849e4343be2917bc20a0d9aa1622007af49 Mon Sep 17 00:00:00 2001
From: ChangHyun Lee <leechwin.lee@samsung.com>
Date: Fri, 14 Apr 2017 14:41:06 +0900
Subject: [PATCH] [TIC-Web] fix the deepscan bugs

- fix the deepscan warning and error

Change-Id: I971427ebd4ead57f8afa18f28469c84b31534e1d
Signed-off-by: ChangHyun Lee <leechwin.lee@samsung.com>
---
 controller/dbpool.js         | 8 ++++----
 controller/dbquery.js        | 5 +++--
 controller/mic.js            | 9 ---------
 controller/router.js         | 2 ++
 controller/server.js         | 3 ++-
 controller/socketio.js       | 5 +++--
 controller/ticcore.js        | 6 ++----
 public/src/js/page/import.js | 3 +--
 8 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/controller/dbpool.js b/controller/dbpool.js
index 16c26be..973a306 100644
--- a/controller/dbpool.js
+++ b/controller/dbpool.js
@@ -84,19 +84,19 @@ dbPool.prototype.query = function query (query, params) {
                 if (err) {
                     mariaPool.destroy(client);
                     meta.result = err;
-                    return reject(meta);
+                    reject(meta);
                 }
 
                 meta.result = rows;
                 mariaPool.release(client);
                 logger.info(JSON.stringify(meta));
-                return resolve(meta);
+                resolve(meta);
             });
         }).catch(function (err) {
             logger.error(err.message);
-            return reject(err);
+            reject(err);
         });
     });
 };
 
-module.exports = dbPool;
\ No newline at end of file
+module.exports = dbPool;
diff --git a/controller/dbquery.js b/controller/dbquery.js
index 7b3dbce..09f429a 100644
--- a/controller/dbquery.js
+++ b/controller/dbquery.js
@@ -28,7 +28,7 @@ var MAX_IMAGE_PER_PAGE = 4;
 /**
  * mariadb
  */
-var mariadb = mariadb || {};
+var mariadb = {};
 
 mariadb.queries = {
     'addJob': [
@@ -454,9 +454,10 @@ mariadb.connectToClient = function connectToClient() {
             if (err) {
                 logger.error('connection error');
                 logger.error(err);
-                throw err;
+                reject(err);
             }
             logger.info('connection success');
+            reolsve();
         });
     });
 };
diff --git a/controller/mic.js b/controller/mic.js
index 42f6168..27f96e0 100644
--- a/controller/mic.js
+++ b/controller/mic.js
@@ -1,13 +1,6 @@
 'use strict';
 
-/**
- * using WebSocket
- */
-
-var fs = require('fs');
-var path = require('path');
 var mkdirp = require('mkdirp');
-var request = require('request');
 var exec = require('child_process').exec;
 var TreeKill = require('tree-kill');
 var util = require('util');
@@ -31,8 +24,6 @@ var Mic = {};
  */
 var processMgr = [];
 
-var user;
-
 Mic.isAvailable = function isAvailable() {
     if (processMgr.length < PROCESS_CNT_MAX) {
         return true;
diff --git a/controller/router.js b/controller/router.js
index 1b04e76..72f2e31 100644
--- a/controller/router.js
+++ b/controller/router.js
@@ -1,3 +1,5 @@
+'use strict';
+
 // middle-ware
 var express = require('express');
 var router = express.Router();
diff --git a/controller/server.js b/controller/server.js
index db3ecc0..d432946 100644
--- a/controller/server.js
+++ b/controller/server.js
@@ -1,4 +1,5 @@
-var express = require('express');
+'use strict';
+
 var moment = require('moment');
 var JL = require('jsnlog').JL;
 var http = require('http');
diff --git a/controller/socketio.js b/controller/socketio.js
index 00c49d3..010d7a7 100644
--- a/controller/socketio.js
+++ b/controller/socketio.js
@@ -1,7 +1,8 @@
+'use strict';
+
 var socketio = require('socket.io');
 var JL = require('jsnlog').JL;
 var logger = JL('socketio.js');
-var url = require('url');
 var Mic = require('./mic');
 var AppConfig = require('../config.json');
 
@@ -48,4 +49,4 @@ var listen = function listen (server) {
     return io;
 };
 
-module.exports.listen = listen;
\ No newline at end of file
+module.exports.listen = listen;
diff --git a/controller/ticcore.js b/controller/ticcore.js
index 1992fa0..0a10e5e 100644
--- a/controller/ticcore.js
+++ b/controller/ticcore.js
@@ -1,16 +1,14 @@
 'use strict';
 
-var mariaSql = require('mariasql');
 var JL = require('jsnlog').JL;
 var logger = JL('ticcore.js');
 var http = require('http');
 var AppConfig = require('../config.json');
-var _ = require('lodash');
 
 /**
  * ticcore
  */
-var ticcore = ticcore ||{};
+var ticcore = {};
 
 /**
  * server
@@ -149,4 +147,4 @@ ticcore.getExports = function getExports(req, res) {
     ticCoreReq.end();
 };
 
-module.exports = ticcore;
\ No newline at end of file
+module.exports = ticcore;
diff --git a/public/src/js/page/import.js b/public/src/js/page/import.js
index bba5d8d..e8be7a9 100644
--- a/public/src/js/page/import.js
+++ b/public/src/js/page/import.js
@@ -83,12 +83,12 @@ define([
     function _radioHandler() {
         $("input:radio[name='recipe']").each(function (index, value) {
             var classDomQuery = '.' + value.id;
+            var helpDomQuery = '#' + value.id + '-help';
             $(classDomQuery).each(function (index, dom) {
                 // recipe file
                 if (dom.id === 'tic-import-recipe-file-input') {
                     if (value.checked === false ) {
                         recipeDropZone.disable();
-                        var helpDomQuery = '#' + value.id + '-help';
                         $(helpDomQuery).empty();
                     } else {
                         recipeDropZone.enable();
@@ -98,7 +98,6 @@ define([
                     // recipe and repo url
                     if (value.checked === false ) {
                         $(dom).val('').change();
-                        var helpDomQuery = '#' + value.id + '-help';
                         $(helpDomQuery).empty();
                     }
                     $(dom).prop('disabled', !value.checked);
-- 
2.7.4