From 88faef416eadc891537f03926160e35245125c72 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Sun, 18 Mar 2018 16:37:21 +0100 Subject: Replace console logs with debugger --- src/api/server/LocalApi.js | 8 +++--- src/api/server/ServerApi.js | 60 +++++++++++++++++++++++---------------------- 2 files changed, 36 insertions(+), 32 deletions(-) (limited to 'src/api/server') diff --git a/src/api/server/LocalApi.js b/src/api/server/LocalApi.js index aa3a7d655..4d2497c61 100644 --- a/src/api/server/LocalApi.js +++ b/src/api/server/LocalApi.js @@ -3,6 +3,8 @@ import du from 'du'; import { getServicePartitionsDirectory } from '../../helpers/service-helpers.js'; +const debug = require('debug')('LocalApi'); + const { session } = remote; export default class LocalApi { @@ -13,7 +15,7 @@ export default class LocalApi { du(partitionsDir, (err, size) => { if (err) reject(err); - console.debug('LocalApi::getAppCacheSize resolves', size); + debug('LocalApi::getAppCacheSize resolves', size); resolve(size); }); }); @@ -22,14 +24,14 @@ export default class LocalApi { async clearCache(serviceId) { const s = session.fromPartition(`persist:service-${serviceId}`); - console.debug('LocalApi::clearCache resolves', serviceId); + debug('LocalApi::clearCache resolves', serviceId); return new Promise(resolve => s.clearCache(resolve)); } async clearAppCache() { const s = session.defaultSession; - console.debug('LocalApi::clearCache clearAppCache'); + debug('LocalApi::clearCache clearAppCache'); return new Promise(resolve => s.clearCache(resolve)); } } diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js index 8f3297d13..353faa7f4 100644 --- a/src/api/server/ServerApi.js +++ b/src/api/server/ServerApi.js @@ -27,6 +27,8 @@ import { removeServicePartitionDirectory, } from '../../helpers/service-helpers.js'; +const debug = require('debug')('ServerApi'); + module.paths.unshift( getDevRecipeDirectory(), getRecipeDirectory(), @@ -55,7 +57,7 @@ export default class ServerApi { } const u = await request.json(); - console.debug('ServerApi::login resolves', u); + debug('ServerApi::login resolves', u); return u.token; } @@ -69,7 +71,7 @@ export default class ServerApi { } const u = await request.json(); - console.debug('ServerApi::signup resolves', u); + debug('ServerApi::signup resolves', u); return u.token; } @@ -82,7 +84,7 @@ export default class ServerApi { throw request; } - console.debug('ServerApi::inviteUser'); + debug('ServerApi::inviteUser'); return true; } @@ -98,7 +100,7 @@ export default class ServerApi { } const r = await request.json(); - console.debug('ServerApi::retrievePassword'); + debug('ServerApi::retrievePassword'); return r; } @@ -112,7 +114,7 @@ export default class ServerApi { const data = await request.json(); const user = new UserModel(data); - console.debug('ServerApi::userInfo resolves', user); + debug('ServerApi::userInfo resolves', user); return user; } @@ -128,7 +130,7 @@ export default class ServerApi { const updatedData = await request.json(); const user = Object.assign(updatedData, { data: new UserModel(updatedData.data) }); - console.debug('ServerApi::updateUserInfo resolves', user); + debug('ServerApi::updateUserInfo resolves', user); return user; } @@ -141,7 +143,7 @@ export default class ServerApi { } const data = await request.json(); - console.debug('ServerApi::deleteAccount resolves', data); + debug('ServerApi::deleteAccount resolves', data); return data; } @@ -157,7 +159,7 @@ export default class ServerApi { let services = await this._mapServiceModels(data); services = services.filter(service => service !== null); - console.debug('ServerApi::getServices resolves', services); + debug('ServerApi::getServices resolves', services); return services; } @@ -181,7 +183,7 @@ export default class ServerApi { const service = Object.assign(serviceData, { data: await this._prepareServiceModel(serviceData.data) }); - console.debug('ServerApi::createService resolves', service); + debug('ServerApi::createService resolves', service); return service; } @@ -205,7 +207,7 @@ export default class ServerApi { const service = Object.assign(serviceData, { data: await this._prepareServiceModel(serviceData.data) }); - console.debug('ServerApi::updateService resolves', service); + debug('ServerApi::updateService resolves', service); return service; } @@ -240,7 +242,7 @@ export default class ServerApi { throw request; } const serviceData = await request.json(); - console.debug('ServerApi::reorderService resolves', serviceData); + debug('ServerApi::reorderService resolves', serviceData); return serviceData; } @@ -255,7 +257,7 @@ export default class ServerApi { removeServicePartitionDirectory(id, true); - console.debug('ServerApi::deleteService resolves', data); + debug('ServerApi::deleteService resolves', data); return data; } @@ -277,7 +279,7 @@ export default class ServerApi { this.recipes = this.recipes.concat(this._getDevRecipes()); - console.debug('StubServerApi::getInstalledRecipes resolves', this.recipes); + debug('StubServerApi::getInstalledRecipes resolves', this.recipes); return this.recipes; } @@ -290,7 +292,7 @@ export default class ServerApi { throw request; } const recipes = await request.json(); - console.debug('ServerApi::getRecipeUpdates resolves', recipes); + debug('ServerApi::getRecipeUpdates resolves', recipes); return recipes; } @@ -305,7 +307,7 @@ export default class ServerApi { const data = await request.json(); const recipePreviews = this._mapRecipePreviewModel(data); - console.debug('ServerApi::getRecipes resolves', recipePreviews); + debug('ServerApi::getRecipes resolves', recipePreviews); return recipePreviews; } @@ -322,7 +324,7 @@ export default class ServerApi { // data = this._addLocalRecipesToPreviews(data); const recipePreviews = this._mapRecipePreviewModel(data); - console.debug('ServerApi::getFeaturedRecipes resolves', recipePreviews); + debug('ServerApi::getFeaturedRecipes resolves', recipePreviews); return recipePreviews; } @@ -336,7 +338,7 @@ export default class ServerApi { const data = await request.json(); const recipePreviews = this._mapRecipePreviewModel(data); - console.debug('ServerApi::searchRecipePreviews resolves', recipePreviews); + debug('ServerApi::searchRecipePreviews resolves', recipePreviews); return recipePreviews; } @@ -350,7 +352,7 @@ export default class ServerApi { fs.ensureDirSync(recipeTempDirectory); const res = await fetch(packageUrl); - console.debug('Recipe downloaded', recipeId); + debug('Recipe downloaded', recipeId); const buffer = await res.buffer(); fs.writeFileSync(archivePath, buffer); @@ -392,7 +394,7 @@ export default class ServerApi { const data = await request.json(); const plan = new PlanModel(data); - console.debug('ServerApi::getPlans resolves', plan); + debug('ServerApi::getPlans resolves', plan); return plan; } @@ -408,7 +410,7 @@ export default class ServerApi { } const data = await request.json(); - console.debug('ServerApi::getHostedPage resolves', data); + debug('ServerApi::getHostedPage resolves', data); return data; } @@ -421,7 +423,7 @@ export default class ServerApi { } const data = await request.json(); - console.debug('ServerApi::getPaymentDashboardUrl resolves', data); + debug('ServerApi::getPaymentDashboardUrl resolves', data); return data; } @@ -434,7 +436,7 @@ export default class ServerApi { } const data = await request.json(); const orders = this._mapOrderModels(data); - console.debug('ServerApi::getSubscriptionOrders resolves', orders); + debug('ServerApi::getSubscriptionOrders resolves', orders); return orders; } @@ -451,7 +453,7 @@ export default class ServerApi { } const data = await request.json(); const news = this._mapNewsModels(data); - console.debug('ServerApi::getLatestNews resolves', news); + debug('ServerApi::getLatestNews resolves', news); return news; } @@ -465,7 +467,7 @@ export default class ServerApi { throw request; } - console.debug('ServerApi::hideNews resolves', id); + debug('ServerApi::hideNews resolves', id); } // Health Check @@ -476,7 +478,7 @@ export default class ServerApi { if (!request.ok) { throw request; } - console.debug('ServerApi::healthCheck resolves'); + debug('ServerApi::healthCheck resolves'); } async getLegacyServices() { @@ -502,7 +504,7 @@ export default class ServerApi { return service; })); - console.debug('ServerApi::getLegacyServices resolves', services); + debug('ServerApi::getLegacyServices resolves', services); return services; } } catch (err) { @@ -535,7 +537,7 @@ export default class ServerApi { return new ServiceModel(service, recipe); } catch (e) { - console.debug(e); + debug(e); return null; } } @@ -553,7 +555,7 @@ export default class ServerApi { await this.getRecipePackage(recipeId); - console.debug('Rerun ServerAPI::getInstalledRecipes'); + debug('Rerun ServerAPI::getInstalledRecipes'); await this.getInstalledRecipes(); recipe = this.recipes.find(r => r.id === recipeId); @@ -653,7 +655,7 @@ export default class ServerApi { return recipes; } catch (err) { - console.debug('Could not load dev recipes'); + debug('Could not load dev recipes'); return false; } } -- cgit v1.2.3-70-g09d2