Major Update:
- Updated all Logged messages, standardised DebugLevel:
- dlNone - Show startup and stop
- dlLow - Show creation/destruction of Function Blocks and Local IO
- dlMedium - Show connection events, eg. open/close
- dlHigh - Show data flow events
-LogCore:
- LogMessage and ShowOutput uses va_list
only run printf if DebugLevel correct
- Remove global LogStr[] variable
- SelectableCore:
- Implemented Auto-management of handles
auto open on startup/fail/close
- Changed simple Open/Close/Read/Write methods to inline
- Do not set Select Write trigger for server socket
- Memory leak, setting address twice on RemoteClient
- Bug fix, only send handle out data if DebugLevel = dlHigh
- Bug fix, do not Read/ProcessBuffer if no InputBuffer
This commit is contained in:
@@ -66,7 +66,6 @@ void ConfigureSignalHandlers()
|
||||
void SignalTerminate( int sig )
|
||||
{
|
||||
char SigName[10];
|
||||
char LogMsg[200];
|
||||
|
||||
// Determine signal name
|
||||
switch (sig)
|
||||
@@ -88,21 +87,16 @@ void SignalTerminate( int sig )
|
||||
std::cerr << "\r\n" << ProcessName << ": ***********************************\n";
|
||||
|
||||
// Create Log Entry
|
||||
sprintf( LogMsg, " ** %s signal received [%d] **", SigName, TermCount );
|
||||
LogMessage( ProcessName, dlNone, LogMsg );//, ltDefault, -1 );
|
||||
|
||||
LogMessage( dlNone, "%s: ** %s signal received [%d] **", ProcessName, SigName, TermCount );
|
||||
if (TermCount < MaxTermCount)
|
||||
{
|
||||
std::cerr << ProcessName << ": ** Terminating normally... **\n";
|
||||
std::cerr << ProcessName << ": ***********************************\n\n";
|
||||
}
|
||||
LogMessage( dlNone, "%s: ** Terminating normally... **", ProcessName );
|
||||
else
|
||||
{
|
||||
std::cerr << ProcessName << ": ** Terminating immediately! **\n";
|
||||
std::cerr << ProcessName << ": ***********************************\n\n";
|
||||
LogMessage( dlNone, "%s: ** Terminating immediately! **", ProcessName );
|
||||
|
||||
std::cerr << ProcessName << ": ***********************************\n\n";
|
||||
|
||||
if (TermCount >= MaxTermCount)
|
||||
exit( sig );
|
||||
}
|
||||
|
||||
return;
|
||||
}//---------------------------------------------------------------------------
|
||||
@@ -111,7 +105,6 @@ void SignalTerminate( int sig )
|
||||
void SignalAbort( int sig )
|
||||
{
|
||||
char SigName[10];
|
||||
char LogMsg[200];
|
||||
|
||||
// Determine Signal name
|
||||
switch (sig)
|
||||
@@ -128,10 +121,9 @@ void SignalAbort( int sig )
|
||||
std::cerr << "\n" << ProcessName << ": ********************************\n";
|
||||
|
||||
// Create Log Entry - but don't post
|
||||
sprintf( LogMsg, " ** %s signal received **", SigName );
|
||||
LogMessage( ProcessName, dlNone, LogMsg );//, ltDefault, -1 );
|
||||
LogMessage( dlNone, "%s: ** %s signal received **", ProcessName, SigName );
|
||||
LogMessage( dlNone, "%s: ** Terminating immediately! **", ProcessName );
|
||||
|
||||
std::cerr << ProcessName << ": ** Terminating immediately! **\n";
|
||||
std::cerr << ProcessName << ": ********************************\n\n";
|
||||
|
||||
// Terminate with signal
|
||||
|
||||
Reference in New Issue
Block a user