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

NSM: Add timestamp to status log.

This commit is contained in:
Jonathan Moore Liles 2013-05-14 20:58:10 -07:00
parent 5e958416cd
commit d0c4be1ff9
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
session-manager/src/session-manager.C
View File

@ -501,6 +501,9 @@ browser_callback ( Fl_Widget *w, void * )
class NSM_Controller : public Fl_Group class NSM_Controller : public Fl_Group
{ {
Fl_Text_Display *status_display;
public: public:
Fl_Pack *clients_pack; Fl_Pack *clients_pack;
@ -516,9 +519,7 @@ public:
Fl_Box *session_name_box; Fl_Box *session_name_box;
Fl_Tree *session_browser; Fl_Tree *session_browser;
Fl_Text_Display *status_display;
int status_lines; int status_lines;
static void cb_handle ( Fl_Widget *w, void *v ) static void cb_handle ( Fl_Widget *w, void *v )
@ -527,6 +528,25 @@ public:
} }
void log_status ( const char *s )
{
time_t now;
now = time( NULL );
struct tm * tm = localtime( &now );
char *ts;
asprintf( &ts, "%02i:%02i:%02i ", tm->tm_hour, tm->tm_min, tm->tm_sec );
status_display->buffer()->append( ts );
free( ts );
status_display->buffer()->append( s );
status_display->scroll( ++status_lines, 0 );
status_display->buffer()->append( "\n" );
}
void void
cb_handle ( Fl_Widget *w ) cb_handle ( Fl_Widget *w )
{ {
@ -1093,10 +1113,7 @@ private:
if ( !strcmp( path, "/nsm/gui/server/message" ) && !strcmp( types, "s" ) ) if ( !strcmp( path, "/nsm/gui/server/message" ) && !strcmp( types, "s" ) )
{ {
controller->status_display->insert( &argv[0]->s ); controller->log_status( &argv[0]->s );
// controller->status_display->show_insert_position();
controller->status_display->scroll( ++controller->status_lines, 0 );
controller->status_display->insert( "\n" );
} }
else if ( !strcmp( path, "/nsm/gui/session/session" ) && else if ( !strcmp( path, "/nsm/gui/session/session" ) &&
! strcmp( types, "s" ) ) ! strcmp( types, "s" ) )
@ -1173,10 +1190,7 @@ private:
else if ( ! strcmp( types, "ss" ) ) else if ( ! strcmp( types, "ss" ) )
{ {
MESSAGE( "%s says %s", &argv[0]->s, &argv[1]->s); MESSAGE( "%s says %s", &argv[0]->s, &argv[1]->s);
controller->log_status( &argv[1]->s );
controller->status_display->insert( &argv[1]->s );
controller->status_display->scroll( ++controller->status_lines, 0 );
controller->status_display->insert( "\n" );
} }
} }