[TIC-Web] remove unused config value

- remove unused config value

Change-Id: I7a94e1a25ca27d11a29935bf8f2b654b2469619a
Signed-off-by: ChangHyun Lee <leechwin.lee@samsung.com>

diff --git a/config.json b/config.json
index 0677e99..c507d4f 100644 (file)
--- a/config.json
+++ b/config.json
@@ -3,9 +3,15 @@
         "PORT" : 8081,
         "PATH": "/var/tmp/tic-web/",
         "PATH_ABSTRACT": "/tic/",
-        "LOG_FILE" : "/var/tmp/tic-web/tic-web.log",
-        "LOG_FILE_NAME": "mic.log",
-        "IMAGE_FILE_NAME": "image.tar.gz"
+        "PATH_RECIPE_IMPORT" : "/var/tmp/tic-web/recipe/import/",
+        "PATH_RECIPE_EXPORT" : "/var/tmp/tic-web/recipe/export/",
+        "LOG" : "/var/tmp/tic-web/tic-web.log"
+    },
+    "TIC_CORE": {
+        "PORT" : 8082
+    },
+    "MIC" : {
+        "LOG": "mic.log"
     },
     "DATABASE": {
         "USERNAME": "tic",
@@ -22,12 +28,6 @@
             "MAXWAITINGCLIENTS": 20
         }
     },
-    "TIC_CORE": {
-        "PORT" : 8082
-    },
-    "MIC" : {
-        "OUT_DIR" : "/var/tmp/tic-web/images/"
-    },
     "EVENT": {
         "SOCKET":{
             "FS_IMAGE_ADD_FROM": "ws/fs/image/add/from",

diff --git a/controller/filesystem.js b/controller/filesystem.js
index 78b9b7e..6e8a5fd 100644 (file)
--- a/controller/filesystem.js
+++ b/controller/filesystem.js
@@ -15,7 +15,7 @@ FileSystem.readLogFile = function readLogFile (req, res) {
 
     strJobId = req.params.id;
 
-    strJobLogPath = AppConfig.TIC_WEB.PATH + strJobId + '/' + AppConfig.TIC_WEB.LOG_FILE_NAME;
+    strJobLogPath = AppConfig.TIC_WEB.PATH + strJobId + '/' + AppConfig.MIC.LOG;
 
     fs.readFile(strJobLogPath, { encoding: 'utf8' }, function (err, data ) {
         res.json(data);

diff --git a/controller/mic.js b/controller/mic.js
index d8f220b..cd4b5a5 100644 (file)
--- a/controller/mic.js
+++ b/controller/mic.js
@@ -99,7 +99,7 @@ Mic.create = function create(paramObj, io) {
 
     logger.info('MIC Create: paramObj = ' + JSON.stringify(paramObj));
 
-    strLogfile = paramObj.pathOutput + AppConfig.TIC_WEB.LOG_FILE_NAME;
+    strLogfile = paramObj.pathOutput + AppConfig.MIC.LOG;
     strOutdir = paramObj.pathOutput;
     strArch = paramObj.imageArch;
     strRecordPkgs = 'name';
@@ -178,6 +178,8 @@ Mic.init = function init () {
         });
     }
     fnMkdir(AppConfig.TIC_WEB.PATH);
+    fnMkdir(AppConfig.TIC_WEB.PATH_RECIPE_IMPORT);
+    fnMkdir(AppConfig.TIC_WEB.PATH_RECIPE_EXPORT);
 }
 
 module.exports = Mic;

diff --git a/controller/server.js b/controller/server.js
index 91a64ea..db3ecc0 100644 (file)
--- a/controller/server.js
+++ b/controller/server.js
@@ -32,7 +32,7 @@ var start = function start (app) {
             timestamp: _timestamp,
             formatter: _customFormatter,
             json: false,
-            filename: AppConfig.TIC_WEB.LOG_FILE,
+            filename: AppConfig.TIC_WEB.LOG,
             maxsize: 104857600, // 100 MB = 1024 * 1024 * 100 = 104857600 Bytes
             maxFiles: 5
         });

diff --git a/public/src/js/model/ImageModel.js b/public/src/js/model/ImageModel.js
index 1d061ee..ec507dc 100644 (file)
--- a/public/src/js/model/ImageModel.js
+++ b/public/src/js/model/ImageModel.js
@@ -76,7 +76,7 @@ define([
     };
 
     ImageModel.prototype.setJobAbsLogPath = function setJobAbsLogPath() {
-        this.jobAbsLogPath = this.getJobAbsPath() + AppConfig.TIC_WEB.LOG_FILE_NAME;
+        this.jobAbsLogPath = this.getJobAbsPath() + AppConfig.MIC.LOG;
     };
 
     ImageModel.prototype.getJobAbsKsPath = function getJobAbsKsPath() {

diff --git a/public/src/js/model/JobModel.js b/public/src/js/model/JobModel.js
index 04b51b2..d92df85 100644 (file)
--- a/public/src/js/model/JobModel.js
+++ b/public/src/js/model/JobModel.js
@@ -111,7 +111,7 @@ define([
     };
 
     JobModel.prototype.setJobLogPath = function () {
-        this.jobLogPath = this.getJobPath() + AppConfig.TIC_WEB.LOG_FILE_NAME;
+        this.jobLogPath = this.getJobPath() + AppConfig.MIC.LOG;
     };
 
     JobModel.prototype.getJobArch = function () {
@@ -132,7 +132,7 @@ define([
     };
 
     JobModel.prototype.setJobAbsLogPath = function () {
-        this.jobAbsLogPath = this.getJobAbsPath() + AppConfig.TIC_WEB.LOG_FILE_NAME;
+        this.jobAbsLogPath = this.getJobAbsPath() + AppConfig.MIC.LOG;
     };
 
     JobModel.prototype.getJobKsPath = function () {

diff --git a/public/src/js/widget/ImageEmptyItem.js b/public/src/js/widget/ImageEmptyItem.js
index 2700709..d7df44e 100644 (file)
--- a/public/src/js/widget/ImageEmptyItem.js
+++ b/public/src/js/widget/ImageEmptyItem.js
@@ -10,9 +10,7 @@ define([
     'use strict';
 
     var strEmptyItem = [
-        '<li class="list-group-item">',
-            '<p>There is no data.</p>',
-        '</li>'
+        '<li class="list-group-item"></li>'
     ];
 
     var ImageEmptyItem = function () {

diff --git a/public/src/js/widget/ImageItem.js b/public/src/js/widget/ImageItem.js
index d2cb4e2..f583cb6 100644 (file)
--- a/public/src/js/widget/ImageItem.js
+++ b/public/src/js/widget/ImageItem.js
@@ -62,7 +62,7 @@ define([
             fileTime: item.getImageUptime(),
             imageFileName: item.getImageName(),
             ksFileName: item.getImageKs() || 'None',
-            logFileName: AppConfig.TIC_WEB.LOG_FILE_NAME,
+            logFileName: AppConfig.MIC.LOG,
             imagePath: item.getJobAbsImagePath(),
             classJobKsPath: item.getImageHasKsFile() === '0' ? 'btnnotactive' : '',
             ksPath: item.getJobAbsKsPath(),

diff --git a/public/src/js/widget/JobTableEmptyItem.js b/public/src/js/widget/JobTableEmptyItem.js
index 47dd97c..5453ffb 100644 (file)
--- a/public/src/js/widget/JobTableEmptyItem.js
+++ b/public/src/js/widget/JobTableEmptyItem.js
@@ -10,9 +10,7 @@ define([
     'use strict';
 
     var strEmptyRow = [
-        '<tr id="job_table_row_<%= rowNum %>" class="empty_job_table_row">',
-            '<td colspan="9">There is no data.</td>',
-        '</tr>'
+        '<tr id="job_table_row_<%= rowNum %>" class="empty_job_table_row"></tr>'
     ];
 
     var JobTableEmptyItem = function () {