Merge pull request #149 from bookchin/master

v3.1.0

.jshintrc

@@ -24,7 +24,7 @@
   "undef": true,
   "unused": true,
   "maxparams": 4,
-  "maxstatements": 15,
+  "maxstatements": 20,
   "maxcomplexity": 6,
   "maxdepth": 3,
   "maxlen": 80,

bin/storjshare-logs.js

@@ -8,6 +8,7 @@ const {Tail} = require('tail');
 const colors = require('colors/safe');
 const storjshare_logs = require('commander');
 const fs = require('fs');
+const path = require('path');
 const FsLogger = require('fslogger');
 
 storjshare_logs
@@ -88,6 +89,14 @@ utils.connectToDaemon(config.daemonRpcPort, function(rpc, sock) {
       }
     }
 
+    try {
+      if (!fs.statSync(logFileDir).isDirectory()) {
+        logFileDir = path.dirname(logFileDir);
+      }
+    } catch (err) {
+      logFileDir = path.dirname(logFileDir);
+    }
+
     const fslogger = new FsLogger(logFileDir, storjshare_logs.nodeid);
 
     let currentFile = null;

lib/api.js

@@ -132,9 +132,20 @@ class RPC {
       );
       share.readyState = RPC.SHARE_STARTED;
 
-      const fslogger = new FsLogger((!share.config.loggerOutputFile) ?
-                                path.join(homedir(),'.config/storjshare/logs') :
-                                share.config.loggerOutputFile, nodeId);
+      let loggerOutputFile = !share.config.loggerOutputFile
+        ? path.join(homedir(), '.config/storjshare/logs')
+        : share.config.loggerOutputFile;
+
+      try {
+        if (!fs.statSync(loggerOutputFile).isDirectory()) {
+          loggerOutputFile = path.dirname(loggerOutputFile);
+        }
+      } catch (err) {
+        loggerOutputFile = path.dirname(loggerOutputFile);
+      }
+
+      const fslogger = new FsLogger(loggerOutputFile, nodeId);
+
       fslogger.setLogLevel(config.logVerbosity);
 
       share.process.stderr.on('data', function(data) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "storjshare-daemon",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "daemon + process manager for sharing space on the storj network",
   "main": "index.js",
   "bin": {
@@ -72,7 +72,7 @@
     "pretty-ms": "^2.1.0",
     "rc": "^1.1.6",
     "readable-stream": "^2.2.2",
-    "storj-lib": "^6.4.2",
+    "storj-lib": "^6.5.0",
     "storj-telemetry-reporter": "^5.0.0",
     "strip-json-comments": "^2.0.1",
     "tail": "^1.2.1"

test/api.unit.js

@@ -166,7 +166,9 @@ describe('class:RPC', function() {
           createWriteStream: sinon.stub().returns(new Writable({
             write: (d, e, cb) => cb()
           })),
-          statSync: sinon.stub(),
+          statSync: sinon.stub().returns({
+            isDirectory: () => true
+          }),
           readFileSync: sinon.stub().returns(Buffer.from('{}'))
         },
         './utils': {
@@ -212,7 +214,9 @@ describe('class:RPC', function() {
           createWriteStream: sinon.stub().returns(new Writable({
             write: (d, e, cb) => cb()
           })),
-          statSync: sinon.stub(),
+          statSync: sinon.stub().returns({
+            isDirectory: () => false
+          }),
           readFileSync: sinon.stub().returns(Buffer.from('{}'))
         },
         './utils': {