added licence field

tableflip · Feb 20, 2015 · 7f6f602 · 7f6f602
1 parent 8bad95b
commit 7f6f602
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Tableflip
+Copyright (c) 2015 Tableflip
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/UPGRADING.md b/UPGRADING.md
@@ -9,10 +9,11 @@
 
  2. Rename your configuration files and directories (all .key .json etc files should come too):
     * `/etc/boss` becomes `/etc/guvnor`
-    * `/etc/boss/bossrc` becomes `/etc/guvnor/guvnorrc`
+    * `/etc/boss/bossrc` becomes `/etc/guvnor/guvnor`
     * `~/.config/boss/bossweb` becomes `~/.config/guvnor/guvnor-web`
     * `~/.config/boss/bossweb-hosts` becomes `~/.config/guvnor/guvnor-web-hosts`
     * `~/.config/boss/bossweb-users` becomes `~/.config/guvnor/guvnor-web-users`
+    * If you have a `[boss]` section in `/etc/guvnor/guvnor`, rename it `[guvnor]`
  3. Rename run/log/app directories
     * `/var/log/boss` becomes `/var/log/guvnor`
     * `/var/run/boss` becomes `/var/run/guvnor`

diff --git a/guvnorrc → guvnor b/guvnorrc → guvnor
diff --git a/lib/cli/index.js b/lib/cli/index.js
@@ -9,7 +9,7 @@ var Container = require('wantsit').Container,
 var logLevel = (process.argv.indexOf('--verbose') != -1  || process.argv.indexOf('-v') != -1) ? 'debug': 'warn'
 
 var container = new Container()
-container.register('config', require('boss-rc')('guvnor/guvnor', path.resolve(__dirname, '../../guvnorrc')))
+container.register('config', require('boss-rc')('guvnor/guvnor', path.resolve(__dirname, '../../guvnor')))
 container.register('logger', new winston.Logger({
   transports: [
     new winston.transports.Console({
@@ -45,7 +45,7 @@ process.on('uncaughtException', function(error) {
   if(logLevel == 'debug') {
     logger.error('Uncaught exception', error.message)
     logger.error(error.stack)
-  } else {
+  } else if(error.message && error.message != 'undefined') {
     logger.error(error.message)
   }
 

diff --git a/package.json b/package.json
@@ -2,6 +2,7 @@
   "name": "guvnor",
   "description": "A node process manager that isn't spanners all the way down",
   "version": "2.6.3",
+  "license": "MIT",
   "prefer-global": true,
   "homepage": "https://github.com/tableflip/guvnor",
   "repository": {