From f7420fc4a6bf66a85c87ecb141d44e4065ea35a4 Mon Sep 17 00:00:00 2001 From: Guy Halford-Thompson Date: Thu, 18 Oct 2012 00:12:51 +0000 Subject: [PATCH 1/5] Added port for appfog --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index 05f8810..d9cbe3a 100644 --- a/server.js +++ b/server.js @@ -38,6 +38,6 @@ glog.rebuild(function() { glog.req_home(req, res, next, options) }); }) - ).listen(options.port); + ).listen(process.env.VCAP_APP_PORT || options.port); }); }); From edf4a4c3f45db16a88c57a1dfde4be15f78fe447 Mon Sep 17 00:00:00 2001 From: Guy Halford-Thompson Date: Sat, 20 Oct 2012 03:56:50 +0100 Subject: [PATCH 2/5] Use glogger logging package --- lib/glog.js | 44 +++++++++++++++++++++++--------------------- server.js | 6 +++++- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/lib/glog.js b/lib/glog.js index b8063b2..299431e 100644 --- a/lib/glog.js +++ b/lib/glog.js @@ -10,6 +10,8 @@ var path = require('path'), async = require('async'), config = require('config'); +// Custom log package +var log = require('glogger')('GLOG'); /* * Setup module @@ -102,8 +104,8 @@ Glog.prototype.load_plugins = function(options, cb) { var p = require('../plugins/' + options.plugins[i]); p.load(GlogPlugin); } catch(e) { - console.log('Error loading plugins'); - console.log(e); + log.info('Error loading plugins'); + log.info(e); } } @@ -120,7 +122,7 @@ Glog.prototype.load_articles = function(options, cb) { article_path = path.join('blog_repo', '/articles'), fn = this; - console.log('Loading articles from ' + article_path); + log.info('Loading articles from ' + article_path); fs.readdir(article_path, function(err, files) { if(err) { @@ -130,14 +132,14 @@ Glog.prototype.load_articles = function(options, cb) { // Remove incorrect extensions for(var i=0; i 1){ - console.log('preplugins'); + log.info('preplugins'); fn.articlePrePlugins[0] = function(wcb){ wcb(null, articles); } @@ -296,7 +298,7 @@ Glog.prototype.render_blog = function(options, articles, cb) { fn.handle_error('Error loading layout. Err: ' + err); } - console.log('Compiling template for home page'); + log.info('Compiling template for home page'); var ja = jade.compile(data), per_page = options.articles_per_page, i, len = Math.floor((articles.length / per_page) + 1), @@ -319,7 +321,7 @@ Glog.prototype.render_blog = function(options, articles, cb) { fn.pages['/'] = fn.pages['_page1']; } - console.log('Compiling template for individual pages'); + log.info('Compiling template for individual pages'); // Loop through articles and compile individual pages for(var i=0; i< articles.length; i++) { @@ -344,11 +346,11 @@ Glog.prototype.render_blog = function(options, articles, cb) { * Handle a request for the home page */ Glog.prototype.req_home = function(req, res, next, options) { - console.log('Home page requested'); + log.info('Home page requested'); var pagenum = req.params.pagenum || 1; - console.log('Rendering page ' + pagenum); + log.info('Rendering page ' + pagenum); // Set headers res.setHeader('Content-Type', 'text/html; charset=utf-8'); @@ -367,7 +369,7 @@ Glog.prototype.req_home = function(req, res, next, options) { * Handle a request for the RSS feed */ Glog.prototype.req_rss = function(req, res, next, options) { - console.log('RSS feed requested'); + log.info('RSS feed requested'); // Set headers res.setHeader('Content-Type', 'application/rss+xml; charset=utf-8'); @@ -386,7 +388,7 @@ Glog.prototype.req_article = function(req, res, next, options) { var fn = this, url = [req.params.year, req.params.month, req.params.article].join('/'); - console.log('Requesting ' + url); + log.info('Requesting ' + url); if(typeof this.pages[url] === 'undefined') { // Set headers res.setHeader('Content-Type', 'text/html; charset=utf-8'); @@ -407,7 +409,7 @@ Glog.prototype.req_article = function(req, res, next, options) { * Generic error handler */ Glog.prototype.handle_error = function(err) { - console.error(err); + log.error(err); } @@ -443,14 +445,14 @@ Glog.prototype.get_repo = function(repo, cb) { var fn = this; // Attempt to clone the git repo - console.log('Cloning git repository ' + repo); + log.info('Cloning git repository ' + repo); exec('git clone ' + repo + ' blog_repo', function(error, stdout, stderr) { if(error) { fn.handle_error('Could not clone git repository: ' + error); cb(false); } - console.log('Stdout: ' + stdout); - console.log('Stderr: ' + stderr); + log.info('Stdout: ' + stdout); + log.info('Stderr: ' + stderr); cb(true); }); @@ -474,14 +476,14 @@ Glog.prototype.update_repo = function(options, cb) { fn.get_repo(options.blog_repository, cb); } else { - console.log('Updating blog git repo'); + log.info('Updating blog git repo'); exec('cd blog_repo; git pull origin master', function(error, stdout, stderr) { if(err) { fn.handle_error('Could not update blog repo: ' + error); cb(false); } - console.log('Stdout: ' + stdout); - console.log('Stderr: ' + stderr); + log.info('Stdout: ' + stdout); + log.info('Stderr: ' + stderr); cb(true); }); diff --git a/server.js b/server.js index d9cbe3a..6565613 100644 --- a/server.js +++ b/server.js @@ -2,15 +2,19 @@ var glog = require('./lib/glog'), express = require('express'), path = require('path'); +// Custom log package +var log = require('glogger')('SERVER'); + glog.rebuild(function() { glog.load_configs(function(options) { - console.log('Starting server on port ' + options.port); + log.info('Starting server on port ' + options.port); var server = express.createServer( express.static(path.join('blog_repo', '/public')), express.staticCache(), + express.logger({'format': 'tiny', 'stream': log.stream()}), express.router(function(app) { app.get('/__render', function(req, res, next) { glog.rebuild(function() { From de301d18f20057296d1eb0d04cf5176a771c2772 Mon Sep 17 00:00:00 2001 From: Guy Halford-Thompson Date: Sat, 20 Oct 2012 06:26:16 +0100 Subject: [PATCH 3/5] Stringify header --- lib/glog.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/glog.js b/lib/glog.js index 299431e..5eebcbe 100644 --- a/lib/glog.js +++ b/lib/glog.js @@ -63,8 +63,6 @@ Glog.prototype.load_configs = function(cb) { options[key] = config[key]; } - console.log(JSON.stringify(options)); - cb(options); } @@ -153,7 +151,7 @@ Glog.prototype.load_articles = function(options, cb) { var body = parts.join('\n\n'); log.info('Read articles with headers: '); - log.info(header); + log.info(JSON.stringify(header)); // Check mandatory fields if(!header.title) { From a05661092b418b482cfd2733c49f319a3ae4f939 Mon Sep 17 00:00:00 2001 From: Guy Halford-Thompson Date: Wed, 23 Jan 2013 05:11:30 +0000 Subject: [PATCH 4/5] Added gloggler to package.json --- lib/glog.js | 2 +- package.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/glog.js b/lib/glog.js index 5eebcbe..b988075 100644 --- a/lib/glog.js +++ b/lib/glog.js @@ -463,7 +463,7 @@ Glog.prototype.get_repo = function(repo, cb) { Glog.prototype.update_repo = function(options, cb) { var fn = this; - +cb(true); return; // If repo does not exist, clone it fs.stat('blog_repo', function(err, stats) { if(err) { diff --git a/package.json b/package.json index c577496..560908c 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,8 @@ "mocha": ">= 0.8.2", "rss": ">= 0.0.3", "async": ">= 0.1.22", - "config": "~0.4.17" + "config": "~0.4.17", + "gloggler" : "git://github.com/guyht/glogger.git" }, "devDependencies": { "underscore": "~1.4.2" From 1e3cdcbbe3607fcc6e23f0ec7da8788b1a41fbb3 Mon Sep 17 00:00:00 2001 From: Guy Halford-Thompson Date: Tue, 22 Jan 2013 21:20:39 -0800 Subject: [PATCH 5/5] Reverting bad commit --- lib/glog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/glog.js b/lib/glog.js index b988075..5eebcbe 100644 --- a/lib/glog.js +++ b/lib/glog.js @@ -463,7 +463,7 @@ Glog.prototype.get_repo = function(repo, cb) { Glog.prototype.update_repo = function(options, cb) { var fn = this; -cb(true); return; + // If repo does not exist, clone it fs.stat('blog_repo', function(err, stats) { if(err) {