mirrors
/
non
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NSM: Clarify client X died message.

This commit is contained in:
Jonathan Moore Liles 2013-04-03 19:38:54 -07:00
parent 2c646deebf
commit acb38aca99
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
session-manager/src/nsmd.C
View File

@ -302,8 +302,7 @@ handle_client_process_death ( int pid )
if ( c ) if ( c )
{ {
MESSAGE( "Client %s died.", c->name );
bool dead_because_we_said = false; bool dead_because_we_said = false;
if ( c->pending_command() == COMMAND_KILL || if ( c->pending_command() == COMMAND_KILL ||
@ -312,6 +311,7 @@ handle_client_process_death ( int pid )
dead_because_we_said = true; dead_because_we_said = true;
} }
c->pending_command( COMMAND_NONE ); c->pending_command( COMMAND_NONE );
c->active = false; c->active = false;
@ -319,6 +319,7 @@ handle_client_process_death ( int pid )
if ( dead_because_we_said ) if ( dead_because_we_said )
{ {
MESSAGE( "Client %s terminated because we told it to.", c->name );
if ( gui_is_active ) if ( gui_is_active )
osc_server->send( gui_addr, "/nsm/gui/client/status", c->client_id, c->status = "removed" ); osc_server->send( gui_addr, "/nsm/gui/client/status", c->client_id, c->status = "removed" );
@ -328,6 +329,8 @@ handle_client_process_death ( int pid )
} }
else else
{ {
MESSAGE( "Client %s died unexpectedly.", c->name );
if ( gui_is_active ) if ( gui_is_active )
osc_server->send( gui_addr, "/nsm/gui/client/status", c->client_id, c->status = "stopped" ); osc_server->send( gui_addr, "/nsm/gui/client/status", c->client_id, c->status = "stopped" );
} }