electron-log
Advanced tools
Comparing version 1.0.9 to 1.0.10
47
index.js
@@ -138,15 +138,5 @@ 'use strict'; | ||
function findLogPath(appName) { | ||
appName = appName || findAppName(); | ||
if (!appName) { | ||
try { | ||
var appPkg = loadAppPackage(); | ||
appName = appPkg.name; | ||
if (!appName) { | ||
transportFile.stream = false; | ||
log('warning', 'electron-log cannot read a name from package.json'); | ||
return false; | ||
} | ||
} catch (e) { | ||
log('warning', 'electron-log: ' + e.message); | ||
return false; | ||
} | ||
return false; | ||
} | ||
@@ -181,2 +171,19 @@ | ||
function findAppName() { | ||
var appName; | ||
try { | ||
var appPkg = loadAppPackage(); | ||
if (!appPkg || !appPkg.name) { | ||
transportFile.stream = false; | ||
log('warning', 'electron-log cannot read a name from package.json'); | ||
return false; | ||
} | ||
appName = appPkg.name; | ||
} catch (e) { | ||
log('warning', 'electron-log: ' + e.message); | ||
return false; | ||
} | ||
return appName; | ||
} | ||
function prepareDir(path, appName) { | ||
@@ -224,8 +231,8 @@ // jshint -W040 | ||
* @throws {Error} | ||
* @return {Object} | ||
* @return {Object|null} | ||
*/ | ||
function loadAppPackage() { | ||
var packageFile = find(process.cwd()) || | ||
find(path.dirname(require.main.filename)); | ||
return require(packageFile); | ||
var packageFile = find(path.dirname(require.main.filename)) || | ||
find(process.cwd()); | ||
return packageFile ? require(packageFile) : null; | ||
@@ -235,2 +242,3 @@ function find(root) { | ||
while (!file) { | ||
var parent; | ||
file = path.join(root, 'package.json'); | ||
@@ -240,8 +248,9 @@ try { | ||
} catch (e) { | ||
root = path.resolve(root, '..'); | ||
parent = path.resolve(root, '..'); | ||
file = null; | ||
} | ||
if (root === path.sep) { | ||
if (root === parent) { | ||
break; | ||
} | ||
root = parent; | ||
} | ||
@@ -300,2 +309,2 @@ return file; | ||
} | ||
// endregion formatter | ||
// endregion formatter |
{ | ||
"name": "electron-log", | ||
"version": "1.0.9", | ||
"version": "1.0.10", | ||
"description": "Just a very simple logging module for your Electron application", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
9483
265