core/redAcore
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Major Update:

Browse Source 
- FunctionCore, SelectCore, SelectableCore, DeviceCore, FileCore:
  - Update Logs to show [ProcessName]/[FunctionName]
- SelectableCore:
  - Update ConnectTypeName array (more readable)
  - Return THandle on all OpenXxxx() methods
  - Do not remove select handle for UDPremoteClient (same handle as server)
  - Add correct Handle when adding RemoteClient to Selector
This commit is contained in:
Charl Wentzel
2018-11-22 11:29:55 +02:00
parent e3e5aa5258
commit 7434334280
6 changed files with 422 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
FileCore.cpp
View File

@@ -17,7 +17,7 @@
//---------------------------------------------------------------------------
// Global Vars
//extern char * ProcessName;
extern char * ProcessName;
//extern CApplication * Application;
//---------------------------------------------------------------------------
@@ -140,7 +140,8 @@ bool CFileCore::OpenFile( TFileHandle * FileHandle )
SetStartTime( &(FileHandle->PersistTime) );
// Report result
if (Log) Log->Message( LogLevel, dlHigh, "%s: File '%s' - Opened", Name, FileHandle->Name );
if (Log) Log->Message( LogLevel, dlHigh, "%s/%s: File '%s' - Opened",
ProcessName, Name, FileHandle->Name );
}
}
@@ -148,7 +149,8 @@ bool CFileCore::OpenFile( TFileHandle * FileHandle )
if (!isOpen(FileHandle))
{
// Report result
if (Log) Log->Message( LogLevel, dlHigh, "%s: File '%s' - Could not open (%d) %s", Name, FileHandle->Name, errno, strerror(errno) );
if (Log) Log->Message( LogLevel, dlHigh, "%s/%s: File '%s' - Could not open (%d) %s",
ProcessName, Name, FileHandle->Name, errno, strerror(errno) );
return false;
}
@@ -172,9 +174,11 @@ bool CFileCore::CloseFile( TFileHandle * FileHandle )
// Report result
if (!isOpen(FileHandle)) {
if (Log) Log->Message( LogLevel, dlHigh, "%s: File '%s' - Closed", Name, FileHandle->Name );
if (Log) Log->Message( LogLevel, dlHigh, "%s/%s: File '%s' - Closed",
ProcessName, Name, FileHandle->Name );
} else {
if (Log) Log->Message( LogLevel, dlHigh, "%s: File '%s' - Could not close", Name, FileHandle->Name );
if (Log) Log->Message( LogLevel, dlHigh, "%s/%s: File '%s' - Could not close",
ProcessName, Name, FileHandle->Name );
}
}
return true;
@@ -270,12 +274,14 @@ int CFileCore::Input( const char * ChannelName, const char * Data, int Len )
if (!(FileHandle = GetFile( ChannelName )))
{
// Log event
if (Log) Log->Message( LogLevel, dlHigh, "%s: Channel '%s' - Input rejected, Channel not found", Name, ChannelName );
if (Log) Log->Message( LogLevel, dlHigh, "%s/%s: Channel '%s' - Input rejected, Channel not found",
ProcessName, Name, ChannelName );
return 0;
}
// Log event
Log->Output( LogLevel, dlHigh, LogOutput, Data, Len, "%s: Channel '%s' - IN:", Name, ChannelName );
if (Log) Log->Output( LogLevel, dlHigh, LogOutput, Data, Len, "%s/%s: Channel '%s' - IN:",
ProcessName, Name, ChannelName );
// Open file
if (!OpenFile( FileHandle )) {