Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/159100
Change subject: Ensure that default temp and output directories exist.
......................................................................
Ensure that default temp and output directories exist.
The default configuration file uses $TMP/ocg-output, which is not guaranteed
to exist.
Change-Id: I63dde199ca4e2441ad3fd6f3ad67fa78757f111d
---
M lib/threads/backend.js
M package.json
2 files changed, 10 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection/OfflineContentGenerator
refs/changes/00/159100/1
diff --git a/lib/threads/backend.js b/lib/threads/backend.js
index b5b39d8..3a38773 100644
--- a/lib/threads/backend.js
+++ b/lib/threads/backend.js
@@ -28,6 +28,7 @@
var child_process = require( 'child_process' );
var eh = require( '../errorhelper.js' );
var fs = require( 'fs' );
+var mkdirp = require('mkdirp');
var mime = require( 'mime' );
var mv = require('mv');
var path = require( 'path' );
@@ -60,9 +61,14 @@
config.backend.temp_dir = os.tmpDir();
}
}
+ // create the temp dir if necessary
+ mkdirp.sync(config.backend.temp_dir);
+
if ( !config.backend.output_dir ) {
config.backend.output_dir = path.join( config.backend.temp_dir,
'ocg-output' );
}
+ // create the output directory if necessary
+ mkdirp.sync(config.backend.output_dir);
redisClient = new Redis(
config.redis.host,
diff --git a/package.json b/package.json
index 5ed7703..85c56a3 100644
--- a/package.json
+++ b/package.json
@@ -24,12 +24,13 @@
"commander": "~2.2.0",
"es6-shim": "~0.13.0",
"mime": "~1.2.11",
- "mv": "~2.0.1",
+ "mkdirp": "~0.5.0",
+ "mv": "~2.0.1",
"prfun": "~1.0.0",
"redis": "~0.9.0",
"rimraf": "~2.2.2",
- "winston": "~0.7.3",
- "sprintf-js": "0.0.7"
+ "sprintf-js": "0.0.7",
+ "winston": "~0.7.3"
},
"optionalDependencies": {
"hiredis": "~0.1.15",
--
To view, visit https://gerrit.wikimedia.org/r/159100
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I63dde199ca4e2441ad3fd6f3ad67fa78757f111d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection/OfflineContentGenerator
Gerrit-Branch: master
Gerrit-Owner: Cscott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
