Skip to content

Commit 0530834

Browse files
authored
All: Drop the modern-syslog dependency, always use console directly
Writing logs to syslog made sense when we run the Download Builder on machines running a lot of other things. Now we're using Digital Ocean droplets where we deploy Docker images which already provides isolation. In addition to that, Digital Ocean provides a view of console logs, but the build & deploy phases only print regular console logs, not syslog messages. This made debugging a recent deploy crash much harder than it should have been. Closes gh-631
1 parent 5ebc915 commit 0530834

8 files changed

+6
-86
lines changed

README.md

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ One version with the `stable` property set to `true` is required. Each release h
5555
### node server.js
5656

5757
Use `node server.js` to run the server. Arguments:
58-
- `--console` output to console instead of syslog (via simple-log module);
5958
- `--host=<name>` specify custom host. Default localhost;
6059
- `--nocache` skip caching release files and theme images;
6160
- `--port=<number>` specify custom port. Default 8088;

download.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ var cache, downloadLogger, jqueryUis,
55
fs = require( "node:fs" ),
66
Handlebars = require( "handlebars" ),
77
JqueryUi = require( "./lib/jquery-ui" ),
8-
logger = require( "./lib/simple-log" ).init( "download.jqueryui.com" ),
98
Packager = require( "node-packager" ),
109
querystring = require( "querystring" ),
1110
themeGallery = require( "./lib/themeroller-themegallery" )(),
@@ -76,7 +75,7 @@ Frontend.prototype = {
7675
jqueryUi = JqueryUi.find( params.version );
7776
}
7877
if ( jqueryUi == null ) {
79-
logger.error( "Invalid input \"version\" = \"" + params.version + "\"" );
78+
console.error( "Invalid input \"version\" = \"" + params.version + "\"" );
8079
data = { error: "invalid version" };
8180
} else {
8281
data = { categories: jqueryUi.categories };

lib/cache.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
"use strict";
22

3-
var Cache, cacheCron, cacheCronTimeout, cacheExpiresTime, caches,
4-
logger = require( "./simple-log" ).init( "download.jqueryui.com" );
3+
var Cache, cacheCron, cacheCronTimeout, cacheExpiresTime, caches;
54

65
cacheExpiresTime = 0;
76
caches = [];
@@ -22,7 +21,7 @@ cacheCron = function() {
2221
}
2322
} );
2423

25-
logger.log( cache.name + " Cleanup:", count );
24+
console.log( cache.name + " Cleanup:", count );
2625
} );
2726
cacheCronTimeout = setTimeout( cacheCron, cacheExpiresTime );
2827
};

lib/simple-log.js

-47
This file was deleted.

lib/themeroller.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
var colorVars, textureVars, themeStaticCss,
44
async = require( "async" ),
55
Image = require( "./themeroller-image" ),
6-
logger = require( "./simple-log" ).init( "download.jqueryui.com" ),
76
querystring = require( "querystring" ),
87
JqueryUi = require( "./jquery-ui" ),
98
semver = require( "semver" ),
@@ -351,7 +350,7 @@ ThemeRoller.prototype = {
351350
var imageFiles = {};
352351
if ( err ) {
353352
err.message = "ThemeRoller#generateImages: " + err.message;
354-
logger.error( err.message );
353+
console.error( err.message );
355354
callback( err );
356355
} else {
357356
results.forEach( function( file ) {

package-lock.json

-24
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

-3
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@
3434
"winston": "^3.17.0",
3535
"wolfy87-eventemitter": "5.2.9"
3636
},
37-
"optionalDependencies": {
38-
"modern-syslog": "1.2.0"
39-
},
4037
"main": "main.js",
4138
"scripts": {
4239
"test": "qunit --require ./test/setup.js test"

server.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22

33
"use strict";
44

5-
var logger = require( "./lib/simple-log" ).init( "download.jqueryui.com" );
6-
75
process.on( "uncaughtException", function( err ) {
8-
logger.error( "Caught exception: " + ( err.stack || err ) );
6+
console.error( "Caught exception: " + ( err.stack || err ) );
97
process.exit( 1 );
108
} );
119

@@ -69,7 +67,7 @@ if ( !argv.nocache ) {
6967
// OBS: We were using an older version of connect, which lacked a descent way to centralize
7068
// requests error handling. We use express now but we haven't updated that code.
7169
function error( err, response ) {
72-
logger.error( "User request exception: " + ( err.stack || err ) );
70+
console.error( "User request exception: " + ( err.stack || err ) );
7371
frontend.error( response );
7472
}
7573

0 commit comments

Comments
 (0)