Merge branch 'master' into github-master

This commit is contained in:
2016-04-28 16:41:10 +08:00
4 changed files with 7 additions and 3 deletions

Submodule botanss updated: f3ba7a4a2d...cbf2246b52

View File

@@ -47,7 +47,7 @@ else
Dragonfly = new Dragonfly(); Dragonfly = new Dragonfly();
global.Dragonfly = Dragonfly; global.Dragonfly = Dragonfly;
GLOBAL.X_SERVER_CLUSTER = cluster; global.X_SERVER_CLUSTER = cluster;
var AppDomain = cl.load( "botanss.net.AppDomain" ); var AppDomain = cl.load( "botanss.net.AppDomain" );
var Httph = cl.load( "botanss.net.Http" ); var Httph = cl.load( "botanss.net.Http" );

View File

@@ -73,6 +73,8 @@ class WNSAuth extends EventEmitter
uuid = Rand.uuid(); uuid = Rand.uuid();
Dragonfly.Debug( "ChannelUri: " + ChannelUri );
_self.__send( ChannelUri, N, ( sender, e ) => { _self.__send( ChannelUri, N, ( sender, e ) => {
if( typeof( e ) == "string" ) if( typeof( e ) == "string" )
@@ -87,6 +89,7 @@ class WNSAuth extends EventEmitter
return; return;
} }
Dragonfly.Debug( e.statusCode + ": " + e.ResponseString );
handler( _self, e.statusCode + " Server Error: Unable to push message to channel" ); handler( _self, e.statusCode + " Server Error: Unable to push message to channel" );
} ); } );
}; };
@@ -245,6 +248,7 @@ class WNSAuth extends EventEmitter
AuthToken = JResponse.access_token; AuthToken = JResponse.access_token;
Dragonfly.Info( "Authorization Success" ); Dragonfly.Info( "Authorization Success" );
Dragonfly.Debug( AuthTokenName + ": " + AuthToken );
Model.Tokens Model.Tokens
.update( .update(
{ name: AuthTokenName } { name: AuthTokenName }

View File

@@ -20,7 +20,7 @@ class App extends Base
// Everything here is plain text // Everything here is plain text
this.HTTP.response.headers[ "Content-Type" ] = "text/plain; charset=utf-8"; this.HTTP.response.headers[ "Content-Type" ] = "text/plain; charset=utf-8";
this.result = "Hello there! This is a notify-term server.\nFor more information please head to https://github.com/tgckpg/notify-term"; this.result = "Hello there! This is a notify-term server.\nFor more information please head to https://github.com/tgckpg/term-notify";
if( !this.HTTP.request.isPost ) if( !this.HTTP.request.isPost )
{ {