Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'v0.6'

Conflicts:
	package.json
  • Loading branch information...
commit f5964aa43fd54abe1c819b7ce9826eedfd8e1e8c 2 parents 142c02e + e31eb8b
mde authored
Showing with 6 additions and 15 deletions.
  1. +2 −13 lib/cluster/worker.js
  2. +1 −1  package.json
  3. +3 −1 templates/Jakefile
View
15 lib/cluster/worker.js
@@ -91,23 +91,12 @@ Worker.prototype = new (function () {
, ssl = this.config.ssl ? ' (SSL)' : ''
, spdy = this.config.spdy ? '(SPDY)' : '';
- utils.network.isPortOpen(port, hostname, function (err, isOpen) {
- if (err) {
- self.log.error(err);
- }
- else if (isOpen) {
- self.log.error("The port " + port + " is already in use.");
- }
- else {
- self.server.listen(port, hostname, function () {
-
+ this.server.listen(port, hostname, function () {
self.log.info('Server worker running in ' + self.config.environment +
- ' on port ' + self.config.port + ssl + spdy + ' with a PID of: ' + process.pid);
+ ' on port ' + self.config.port + ssl + spdy + ' with a PID of: ' + process.pid);
self.log.debug('LOGGING STARTED ============================================');
self.log.debug('============================================================');
});
- }
- });
}
else {
this.log.error('Cannot start server without config.');
View
2  package.json
@@ -8,7 +8,7 @@
"MVC",
"realtime"
],
- "version": "0.6.2",
+ "version": "0.6.13",
"author": "Matthew Eernisse <mde@fleegix.org> (http://fleegix.org)",
"dependencies": {
"jake": "0.5.x",
View
4 templates/Jakefile
@@ -767,7 +767,7 @@ namespace('auth', function () {
var go = false
// FIXME: Pull these version numbers out of geddy-passport's package.json
, packages = 'geddy-passport@0.0.x passport@0.1.x passport-local@0.1.x ' +
- 'passport-facebook@0.1.x passport-twitter@0.1.x'
+ 'passport-facebook@0.1.x passport-twitter@0.1.x passport-yammer@0.1.x'
, readline = require('readline')
, rl = readline.createInterface({
input: process.stdin
@@ -818,6 +818,8 @@ namespace('auth', function () {
"router.get('/auth/twitter/callback').to('Auth.twitterCallback');\n" +
"router.get('/auth/facebook').to('Auth.facebook');\n" +
"router.get('/auth/facebook/callback').to('Auth.facebookCallback');\n" +
+ "router.get('/auth/yammer').to('Auth.yammer');\n" +
+ "router.get('/auth/yammer/callback').to('Auth.yammerCallback');\n" +
"router.resource('users');";
if (addRoute(routerPath, newRoute)) {
Please sign in to comment.
Something went wrong with that request. Please try again.