Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-26 07:10:11 +01:00
Code Issues Projects Releases Wiki Activity

2019-06-21 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added 'RDApplication::syslog()' methods.
This commit is contained in:
Fred Gleason
2019-06-24 16:40:18 -04:00
parent 52dc14a3b3
commit f50447eb8b
71 changed files with 1064 additions and 887 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
ripcd/vguest.cpp
View File

@@ -316,7 +316,7 @@ void VGuest::processCommand(RDMacro *cmd)
(cmd->arg(1).toUInt()>vguest_displays_engine_nums.size())) {
cmd->acknowledge(false);
emit rmlEcho(cmd);
syslog(LOG_WARNING,"*** not enough vGuest arguments ***");
rda->syslog(LOG_WARNING,"*** not enough vGuest arguments ***");
return;
}
if((vguest_displays_engine_nums[cmd->arg(1).toInt()-1]<0)||
@@ -324,7 +324,7 @@ void VGuest::processCommand(RDMacro *cmd)
(vguest_displays_surface_nums[cmd->arg(1).toInt()-1]<0)) {
cmd->acknowledge(false);
emit rmlEcho(cmd);
syslog(LOG_WARNING,"*** invalid vGuest hex parameters ***");
rda->syslog(LOG_WARNING,"*** invalid vGuest hex parameters ***");
return;
}
label=cmd->rollupArgs(5).left(VGUEST_MAX_TEXT_LENGTH);
@@ -461,10 +461,10 @@ void VGuest::connectionClosedData(int id)
{
int interval=GetHoldoff();
if(!vguest_error_notified[id]) {
syslog(LOG_WARNING,
rda->syslog(LOG_WARNING,
"connection to vGuest device at %s:%d closed, attempting reconnect",
(const char *)vguest_ipaddress[id].toString().toUtf8(),
vguest_ipport[id]);
(const char *)vguest_ipaddress[id].toString().toUtf8(),
vguest_ipport[id]);
vguest_error_notified[id]=true;
}
if(vguest_stop_cart[id]>0) {
@@ -541,10 +541,10 @@ void VGuest::errorData(int err,int id)
case Q3Socket::ErrConnectionRefused:
interval=GetHoldoff();
if(!vguest_error_notified[id]) {
syslog(LOG_WARNING,
"connection to vGuest device at %s:%d refused, attempting reconnect",
(const char *)vguest_ipaddress[id].toString().toUtf8(),
vguest_ipport[id]);
rda->syslog(LOG_WARNING,
"connection to vGuest device at %s:%d refused, attempting reconnect",
(const char *)vguest_ipaddress[id].toString().toUtf8(),
vguest_ipport[id]);
vguest_error_notified[id]=true;
}
vguest_reconnect_timer[id]->start(interval,true);
@@ -552,20 +552,20 @@ void VGuest::errorData(int err,int id)
case Q3Socket::ErrHostNotFound:
if(!vguest_error_notified[id]) {
syslog(LOG_WARNING,
"error on connection to vGuest device at %s:%d: Host Not Found",
(const char *)vguest_ipaddress[id].toString().toUtf8(),
vguest_ipport[id]);
rda->syslog(LOG_WARNING,
"error on connection to vGuest device at %s:%d: Host Not Found",
(const char *)vguest_ipaddress[id].toString().toUtf8(),
vguest_ipport[id]);
vguest_error_notified[id]=true;
}
break;
case Q3Socket::ErrSocketRead:
if(!vguest_error_notified[id]) {
syslog(LOG_WARNING,
"error on connection to vGuest device at %s:%d: Socket Read Error",
(const char *)vguest_ipaddress[id].toString().toUtf8(),
vguest_ipport[id]);
rda->syslog(LOG_WARNING,
"error on connection to vGuest device at %s:%d: Socket Read Error",
(const char *)vguest_ipaddress[id].toString().toUtf8(),
vguest_ipport[id]);
vguest_error_notified[id]=true;
}
break;
@@ -596,8 +596,9 @@ void VGuest::pingResponseData(int id)
{
vguest_socket[id]->clearPendingData();
vguest_socket[id]->close();
syslog(LOG_WARNING,"vGuest connection to "+
vguest_ipaddress[id].toString()+" timed out, restarting connection");
rda->syslog(LOG_WARNING,"vGuest connection to "+
vguest_ipaddress[id].toString()+
" timed out, restarting connection");
}
@@ -650,10 +651,10 @@ void VGuest::DispatchCommand(char *cmd,int len,int id)
switch(0xFF&cmd[3]) {
case 0x0A: // Valid connection
case 0x14:
syslog(LOG_INFO,
"connection to vGuest device at %s:%d established",
(const char *)vguest_ipaddress[id].toString().toUtf8(),
vguest_ipport[id]);
rda->syslog(LOG_INFO,
"connection to vGuest device at %s:%d established",
(const char *)vguest_ipaddress[id].toString().toUtf8(),
vguest_ipport[id]);
vguest_error_notified[id]=false;
if(vguest_start_cart[id]>0) {
ExecuteMacroCart(vguest_start_cart[id]);
@@ -668,40 +669,40 @@ void VGuest::DispatchCommand(char *cmd,int len,int id)
case 0x0B: // Invalid Username
case 0x15:
syslog(LOG_WARNING,
rda->syslog(LOG_WARNING,
"connection to vGuest device at %s:%d refused: username invalid",
(const char *)vguest_ipaddress[id].toString().toUtf8(),
vguest_ipport[id]);
(const char *)vguest_ipaddress[id].toString().toUtf8(),
vguest_ipport[id]);
vguest_socket[id]->close();
connectionClosedData(id);
break;
case 0x0C: // Invalid Password
case 0x16:
syslog(LOG_WARNING,
rda->syslog(LOG_WARNING,
"connection to vGuest device at %s:%d refused: password invalid",
(const char *)vguest_ipaddress[id].toString().toUtf8(),
vguest_ipport[id]);
(const char *)vguest_ipaddress[id].toString().toUtf8(),
vguest_ipport[id]);
vguest_socket[id]->close();
connectionClosedData(id);
break;
case 0x0D: // No vGuest Permission
case 0x17:
syslog(LOG_WARNING,
"connection to vGuest device at %s:%d refused: no vGuest permission",
(const char *)vguest_ipaddress[id].toString().toUtf8(),
vguest_ipport[id]);
rda->syslog(LOG_WARNING,
"connection to vGuest device at %s:%d refused: no vGuest permission",
(const char *)vguest_ipaddress[id].toString().toUtf8(),
vguest_ipport[id]);
vguest_socket[id]->close();
connectionClosedData(id);
break;
case 0x0E: // No Profile
case 0x18:
syslog(LOG_WARNING,
"connection to vGuest device at %s:%d refused: no profile assigned",
(const char *)vguest_ipaddress[id].toString().toUtf8(),
vguest_ipport[id]);
rda->syslog(LOG_WARNING,
"connection to vGuest device at %s:%d refused: no profile assigned",
(const char *)vguest_ipaddress[id].toString().toUtf8(),
vguest_ipport[id]);
vguest_socket[id]->close();
connectionClosedData(id);
break;
@@ -715,9 +716,9 @@ void VGuest::DispatchCommand(char *cmd,int len,int id)
emit gpoChanged(vguest_matrix,linenum,true);
}
else {
syslog(LOG_DEBUG,
"unhandled vGuest command received: %s",
(const char *)RenderCommand(cmd,len).toUtf8());
rda->syslog(LOG_DEBUG,
"unhandled vGuest command received: %s",
(const char *)RenderCommand(cmd,len).toUtf8());
}
break;
@@ -728,9 +729,9 @@ void VGuest::DispatchCommand(char *cmd,int len,int id)
emit gpoChanged(vguest_matrix,linenum,false);
}
else {
syslog(LOG_DEBUG,
"unhandled vGuest command received: %s",
(const char *)RenderCommand(cmd,len).toUtf8());
rda->syslog(LOG_DEBUG,
"unhandled vGuest command received: %s",
(const char *)RenderCommand(cmd,len).toUtf8());
}
break;
@@ -744,8 +745,8 @@ void VGuest::DispatchCommand(char *cmd,int len,int id)
break;
default:
syslog(LOG_DEBUG,"unrecognized vGuest command received: %s",
(const char *)RenderCommand(cmd,len).toUtf8());
rda->syslog(LOG_DEBUG,"unrecognized vGuest command received: %s",
(const char *)RenderCommand(cmd,len).toUtf8());
break;
}
}
@@ -759,9 +760,9 @@ void VGuest::MetadataCommand(char *cmd,int len,int id)
vguest_ping_response_timer[id]->stop();
}
else {
syslog(LOG_DEBUG,
"vGuest system at %s understands ping, activating timeout monitoring",
(const char *)vguest_ipaddress[id].toString().toUtf8());
rda->syslog(LOG_DEBUG,
"vGuest system at %s understands ping, activating timeout monitoring",
(const char *)vguest_ipaddress[id].toString().toUtf8());
}
vguest_ping_timer[id]->start(VGUEST_PING_INTERVAL,true);
break;