From 89139fac9c8c610fd41a8535ca2ff7a3d56db89b Mon Sep 17 00:00:00 2001
From: jweg <jweg@informatik.uni-kiel.de>
Date: Tue, 18 Jul 2017 15:02:27 +0200
Subject: [PATCH] removed console.logs
---
backendFunctions.js | 11 +++++------
frontendFunctions.js | 35 ++++++++++++++++-------------------
2 files changed, 21 insertions(+), 25 deletions(-)
diff --git a/backendFunctions.js b/backendFunctions.js
index ec9ec54..04829ef 100644
--- a/backendFunctions.js
+++ b/backendFunctions.js
@@ -2,8 +2,7 @@ var express = require('express');
var exec = require('child_process').exec;
function backendClean(fileName){
- console.log('in backendClean');
-
+
return new Promise((resolve,reject)=>{
exec('cd explorviz-ui-backend/plugins/net/explorviz/ && rm -rf plugins/*', (error, stdout,stderr)=>{
@@ -22,7 +21,7 @@ function backendClean(fileName){
}
function backendPull(fileName){
- console.log('in backendPull');
+
return new Promise((resolve, reject)=> {
exec('cd ' + fileName + ' git pull ', (error, stdout, stderr) => {
@@ -43,7 +42,7 @@ function backendPull(fileName){
}
function backendInstallAddons(checkedFiles,downloadFiles){
- console.log('in backendInstallAddons');
+
return new Promise((resolve, reject)=>{
checkedPlugins = checkedFiles.filter(function(file){
return /\bexplorviz-backend-plugin-\w*/.exec(file);
@@ -52,7 +51,7 @@ function backendInstallAddons(checkedFiles,downloadFiles){
if(checkedPlugins.length !== 0 ){
checkedPlugins.forEach((pluginName) => {
- //TODO want to copy everything in backend-plugin except .git, workaround: ./demo/
+ //TODO want to copy everything in backend-plugin except .git, workaround for now: ./demo/
exec('cd '+ pluginName + ' git pull ' + ' && cp -R ' + ' ./demo/ '+' ../explorviz-ui-backend/plugins/net/explorviz/plugins/ ', (error, stdout, stderr) => { //'cd explorviz-ui-backend/plugins/net/explorviz/plugins/ ' +
if (error) {
@@ -77,7 +76,7 @@ function backendInstallAddons(checkedFiles,downloadFiles){
}
function backendBuild(fileName){
- console.log('in backendBuild');
+
return new Promise((resolve,reject)=>{
exec('cd '+ fileName + ' && mvn compile war:war ', (error,stdout,stderr)=> {
if (error) {
diff --git a/frontendFunctions.js b/frontendFunctions.js
index 948c9cd..469a669 100644
--- a/frontendFunctions.js
+++ b/frontendFunctions.js
@@ -2,8 +2,8 @@
let exec = require('child_process').exec;
function frontendClean(fileName){
- return new Promise((resolve, reject) => {
- console.log('in frontendClean()');
+ return new Promise((resolve, reject) => {
+
//' git fetch origin && git reset --hard origin/master '
exec('cd ' + fileName + ' git checkout package.json && npm prune ', (error, stdout, stderr) => {
@@ -24,24 +24,23 @@
function frontendPull(fileName){
return new Promise((resolve, reject) => {
- console.log('in frontendPull()');
- //' git fetch origin && git reset --hard origin/master '
- exec('cd ' + fileName + ' git checkout package.json && npm prune ' +' && git pull ', (error, stdout, stderr) => {
+
+ exec('cd ' + fileName +' && git pull ', (error, stdout, stderr) => {
- if (error) {
- reject(error)
- return;
- }
+ if (error) {
+ reject(error)
+ return;
+ }
- console.log(stdout);
- console.log(stderr);
- resolve();
- });
- })
+ console.log(stdout);
+ console.log(stderr);
+ resolve();
+ });
+ })
}
function frontendInstallAddons(checkedFiles, downloadFiles){
- console.log('in frontendInstallAddons()');
+
return new Promise((resolve, reject) => {
checkedPlugins = checkedFiles.filter(function(file){
@@ -76,9 +75,7 @@
function frontendBuild(fileName){
return new Promise((resolve,reject)=> {
- console.log('in frontendBuild()');
-
-
+
exec('cd ' + fileName +' && ember build --environment=production', (error, stdout, stderr) => {
if (error) {
@@ -95,7 +92,7 @@
})
- console.log('resolve build:', resolve);
+
}
module.exports = {
--
GitLab