From ac4d9305bc729d22e341f99e47a6c4fc92fcaee5 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Tue, 25 Jun 2019 15:08:12 -0400 Subject: [PATCH] 2019-06-25 Fred Gleason * Adjusted to priority of 'operations' system events to use LOG_INFO priority. --- ChangeLog | 3 +++ cae/cae.cpp | 52 ++++++++++++++++++------------------ cae/cae_alsa.cpp | 2 +- lib/rdaudioimport.cpp | 2 +- lib/rddelete.cpp | 2 +- lib/rdlogplay.cpp | 12 ++++----- lib/rdpam.cpp | 6 ++--- rdcatchd/rdcatchd.cpp | 24 ++++++++--------- rdhpi/rdhpiplaystream.cpp | 2 +- rdhpi/rdhpirecordstream.cpp | 2 +- rdhpi/rdhpisoundcard.cpp | 2 +- ripcd/am16.cpp | 6 ++--- ripcd/btu41mlrweb.cpp | 2 +- ripcd/livewire_mcastgpio.cpp | 2 +- ripcd/local_audio.cpp | 3 ++- ripcd/local_macros.cpp | 16 +++++------ ripcd/quartz1.cpp | 2 +- ripcd/ripcd.cpp | 8 +++--- ripcd/sas16000.cpp | 2 +- ripcd/sasusi.cpp | 6 ++--- ripcd/switcher.cpp | 2 +- ripcd/vguest.cpp | 2 +- web/rdxport/tests.cpp | 2 +- 23 files changed, 83 insertions(+), 79 deletions(-) diff --git a/ChangeLog b/ChangeLog index f6a149ed..53cd12fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18830,3 +18830,6 @@ 2019-06-24 Fred Gleason * Added a 'pypad.rivendellConfig()' method. * Added a 'pypad.syslog()' method. +2019-06-25 Fred Gleason + * Adjusted to priority of 'operations' system events to use + LOG_INFO priority. diff --git a/cae/cae.cpp b/cae/cae.cpp index f7e8c589..7040058f 100644 --- a/cae/cae.cpp +++ b/cae/cae.cpp @@ -394,7 +394,7 @@ MainObject::MainObject(QObject *parent,const char *name) } */ if(rd_config->enableMixerLogging()) { - RDApplication::syslog(rd_config,LOG_NOTICE,"mixer logging enabled"); + RDApplication::syslog(rd_config,LOG_INFO,"mixer logging enabled"); } RDApplication::syslog(rd_config,LOG_INFO,"cae started"); } @@ -460,7 +460,7 @@ void MainObject::loadPlaybackData(int id,unsigned card,const QString &name) play_handle[handle].stream=new_stream; play_handle[handle].owner=id; play_owner[card][new_stream]=id; - RDApplication::syslog(rd_config,LOG_DEBUG, + RDApplication::syslog(rd_config,LOG_INFO, "LoadPlayback Card: %d Stream: %d Name: %s Handle: %d", card,new_stream,(const char *)wavename.toUtf8(),handle); cae_server-> @@ -480,7 +480,7 @@ void MainObject::unloadPlaybackData(int id,unsigned handle) case RDStation::Hpi: if(hpiUnloadPlayback(card,stream)) { play_owner[card][stream]=-1; - RDApplication::syslog(rd_config,LOG_DEBUG, + RDApplication::syslog(rd_config,LOG_INFO, "UnloadPlayback - Card: %d Stream: %d Handle: %d", card,stream,handle); cae_server->sendCommand(id,QString().sprintf("UP %d +!",handle)); @@ -493,7 +493,7 @@ void MainObject::unloadPlaybackData(int id,unsigned handle) case RDStation::Alsa: if(alsaUnloadPlayback(card,stream)) { play_owner[card][stream]=-1; - RDApplication::syslog(rd_config,LOG_DEBUG, + RDApplication::syslog(rd_config,LOG_INFO, "UnloadPlayback - Card: %d Stream: %d Handle: %d", card,stream,handle); cae_server->sendCommand(id,QString().sprintf("UP %d +!",handle)); @@ -506,7 +506,7 @@ void MainObject::unloadPlaybackData(int id,unsigned handle) case RDStation::Jack: if(jackUnloadPlayback(card,stream)) { play_owner[card][stream]=-1; - RDApplication::syslog(rd_config,LOG_DEBUG, + RDApplication::syslog(rd_config,LOG_INFO, "UnloadPlayback - Card: %d Stream: %d Handle: %d", card,stream,handle); cae_server->sendCommand(id,QString().sprintf("UP %d +!",handle)); @@ -540,7 +540,7 @@ void MainObject::playPositionData(int id,unsigned handle,unsigned pos) switch(cae_driver[card]) { case RDStation::Hpi: if(hpiPlaybackPosition(card,stream,pos)) { - RDApplication::syslog(rd_config,LOG_DEBUG, + RDApplication::syslog(rd_config,LOG_INFO, "PlaybackPosition - Card: %d Stream: %d Pos: %d Handle: %d", card,stream,pos,handle); cae_server->sendCommand(id,QString().sprintf("PP %d %d +!",handle,pos)); @@ -552,7 +552,7 @@ void MainObject::playPositionData(int id,unsigned handle,unsigned pos) case RDStation::Alsa: if(alsaPlaybackPosition(card,stream,pos)) { - RDApplication::syslog(rd_config,LOG_DEBUG, + RDApplication::syslog(rd_config,LOG_INFO, "PlaybackPosition - Card: %d Stream: %d Pos: %d Handle: %d", card,stream,pos,handle); cae_server->sendCommand(id,QString().sprintf("PP %d %d +!",handle,pos)); @@ -564,7 +564,7 @@ void MainObject::playPositionData(int id,unsigned handle,unsigned pos) case RDStation::Jack: if(jackPlaybackPosition(card,stream,pos)) { - RDApplication::syslog(rd_config,LOG_DEBUG, + RDApplication::syslog(rd_config,LOG_INFO, "PlaybackPosition - Card: %d Stream: %d Pos: %d Handle: %d", card,stream,pos,handle); cae_server->sendCommand(id,QString().sprintf("PP %d %d +!",handle,pos)); @@ -648,7 +648,7 @@ void MainObject::playData(int id,unsigned handle,unsigned length,unsigned speed, handle,length,speed,pitch_flag)); return; } - RDApplication::syslog(rd_config,LOG_DEBUG, + RDApplication::syslog(rd_config,LOG_INFO, "Play - Card: %d Stream: %d Handle: %d Length: %d Speed: %d Pitch: %d", card,stream,handle,play_length[card][stream], play_speed[card][stream],pitch_flag); @@ -692,7 +692,7 @@ void MainObject::stopPlaybackData(int id,unsigned handle) cae_server->sendCommand(id,QString().sprintf("SP %u -!",handle)); return; } - RDApplication::syslog(rd_config,LOG_DEBUG, + RDApplication::syslog(rd_config,LOG_INFO, "StopPlayback - Card: %d Stream: %d Handle: %d", card,stream,handle); return; @@ -782,7 +782,7 @@ void MainObject::loadRecordingData(int id,unsigned card,unsigned port, bitrate,(const char *)name.toUtf8())); return; } - RDApplication::syslog(rd_config,LOG_DEBUG, + RDApplication::syslog(rd_config,LOG_INFO, "LoadRecord - Card: %d Stream: %d Coding: %d Chans: %d SampRate: %d BitRate: %d Name: %s", card,port,coding,channels,samprate,bitrate, (const char *)wavename.toUtf8()); @@ -832,7 +832,7 @@ void MainObject::unloadRecordingData(int id,unsigned card,unsigned stream) return; } record_owner[card][stream]=-1; - RDApplication::syslog(rd_config,LOG_DEBUG, + RDApplication::syslog(rd_config,LOG_INFO, "UnloadRecord - Card: %d Stream: %d, Length: %u", card,stream,len); cae_server-> @@ -890,7 +890,7 @@ void MainObject::recordData(int id,unsigned card,unsigned stream,unsigned len, card,stream,len,threshold_level)); return; } - RDApplication::syslog(rd_config,LOG_DEBUG, + RDApplication::syslog(rd_config,LOG_INFO, "Record - Card: %d Stream: %d Length: %d Thres: %d", card,stream,record_length[card][stream], record_threshold[card][stream]); @@ -933,7 +933,7 @@ void MainObject::stopRecordingData(int id,unsigned card,unsigned stream) cae_server->sendCommand(id,QString().sprintf("SR %u %u -!",card,stream)); return; } - RDApplication::syslog(rd_config,LOG_DEBUG, + RDApplication::syslog(rd_config,LOG_INFO, "StopRecord - Card: %d Stream: %d",card,stream); } @@ -969,7 +969,7 @@ void MainObject::setInputVolumeData(int id,unsigned card,unsigned stream, return; } if(rd_config->enableMixerLogging()) { - RDApplication::syslog(rd_config,LOG_DEBUG, + RDApplication::syslog(rd_config,LOG_INFO, "SetInputVolume - Card: %d Stream: %d Level: %d", card,stream,level); } @@ -1012,7 +1012,7 @@ void MainObject::setOutputVolumeData(int id,unsigned card,unsigned stream, return; } if(rd_config->enableMixerLogging()) { - RDApplication::syslog(rd_config,LOG_DEBUG, + RDApplication::syslog(rd_config,LOG_INFO, "SetOutputVolume - Card: %d Stream: %d Port: %d Level: %d", card,stream,port,level); } @@ -1059,7 +1059,7 @@ void MainObject::fadeOutputVolumeData(int id,unsigned card,unsigned stream, return; } if(rd_config->enableMixerLogging()) { - RDApplication::syslog(rd_config,LOG_DEBUG, + RDApplication::syslog(rd_config,LOG_INFO, "FadeOutputVolume - Card: %d Stream: %d Port: %d Level: %d Length: %d", card,stream,port,level,length); } @@ -1103,7 +1103,7 @@ void MainObject::setInputLevelData(int id,unsigned card,unsigned port, return; } if(rd_config->enableMixerLogging()) { - RDApplication::syslog(rd_config,LOG_DEBUG, + RDApplication::syslog(rd_config,LOG_INFO, "SetInputLevel - Card: %d Port: %d Level: %d", card,port,level); } @@ -1146,7 +1146,7 @@ void MainObject::setOutputLevelData(int id,unsigned card,unsigned port, return; } if(rd_config->enableMixerLogging()) { - RDApplication::syslog(rd_config,LOG_DEBUG, + RDApplication::syslog(rd_config,LOG_INFO, "SetOutputLevel - Card: %d Port: %d Level: %d", card,port,level); } @@ -1189,7 +1189,7 @@ void MainObject::setInputModeData(int id,unsigned card,unsigned stream, return; } if(rd_config->enableMixerLogging()) { - RDApplication::syslog(rd_config,LOG_DEBUG, + RDApplication::syslog(rd_config,LOG_INFO, "SetInputMode - Card: %d Stream: %d Mode: %d", card,stream,mode); } @@ -1232,7 +1232,7 @@ void MainObject::setOutputModeData(int id,unsigned card,unsigned stream, return; } if(rd_config->enableMixerLogging()) { - RDApplication::syslog(rd_config,LOG_DEBUG, + RDApplication::syslog(rd_config,LOG_INFO, "SetOutputMode - Card: %d Stream: %d Mode: %d", card,stream,mode); } @@ -1275,7 +1275,7 @@ void MainObject::setInputVoxLevelData(int id,unsigned card,unsigned stream, return; } if(rd_config->enableMixerLogging()) { - RDApplication::syslog(rd_config,LOG_DEBUG, + RDApplication::syslog(rd_config,LOG_INFO, "SetInputVOXLevel - Card: %d Stream: %d Level: %d", card,stream,level); } @@ -1318,7 +1318,7 @@ void MainObject::setInputTypeData(int id,unsigned card,unsigned port, return; } if(rd_config->enableMixerLogging()) { - RDApplication::syslog(rd_config,LOG_DEBUG, + RDApplication::syslog(rd_config,LOG_INFO, "SetInputType - Card: %d Port: %d Type: %d", card,port,type); } @@ -1373,7 +1373,7 @@ void MainObject::setAudioPassthroughLevelData(int id,unsigned card, return; } if(rd_config->enableMixerLogging()) { - RDApplication::syslog(rd_config,LOG_DEBUG, + RDApplication::syslog(rd_config,LOG_INFO, "SetPassthroughLevel - Card: %d InPort: %d OutPort: %d Level: %d", card,input,output,level); } @@ -1400,7 +1400,7 @@ void MainObject::setClockSourceData(int id,unsigned card,int input) return; } if(rd_config->enableMixerLogging()) { - RDApplication::syslog(rd_config,LOG_DEBUG, + RDApplication::syslog(rd_config,LOG_INFO, "SetClockSource - Card: %d Source: %d",card,input); } cae_server->sendCommand(id,QString().sprintf("CS %u %u +!",card,input)); @@ -1778,7 +1778,7 @@ void MainObject::KillSocket(int ch) break; default: - RDApplication::syslog(rd_config,LOG_NOTICE, + RDApplication::syslog(rd_config,LOG_DEBUG, "tried to kill unowned socket!"); break; } diff --git a/cae/cae_alsa.cpp b/cae/cae_alsa.cpp index 1e5ed198..a9ff81f0 100644 --- a/cae/cae_alsa.cpp +++ b/cae/cae_alsa.cpp @@ -723,7 +723,7 @@ void MainObject::alsaInit(RDStation *station) if(cae_driver[i]==RDStation::Alsa) { station->setCardDriver(i,RDStation::Alsa); if(snd_ctl_open(&snd_ctl,dev,0)<0) { - RDApplication::syslog(rd_config,LOG_DEBUG, + RDApplication::syslog(rd_config,LOG_INFO, "no control device found for %s", (const char *)dev); station-> diff --git a/lib/rdaudioimport.cpp b/lib/rdaudioimport.cpp index fea9053d..282feccc 100644 --- a/lib/rdaudioimport.cpp +++ b/lib/rdaudioimport.cpp @@ -219,7 +219,7 @@ RDAudioImport::ErrorCode RDAudioImport::runImport(const QString &username, return RDAudioImport::ErrorUrlInvalid; } /* - rda->syslog(LOG_NOTICE,"CURL code: %d [%s]\n",curl_err, + rda->syslog(LOG_DEBUG,"CURL code: %d [%s]\n",curl_err, curl_easy_strerror(curl_err)); */ diff --git a/lib/rddelete.cpp b/lib/rddelete.cpp index 4a303870..e9bcbd13 100644 --- a/lib/rddelete.cpp +++ b/lib/rddelete.cpp @@ -161,7 +161,7 @@ RDDelete::ErrorCode RDDelete::runDelete(const QString &username, break; } if(log_debug) { - rda->syslog(LOG_NOTICE,curl_easy_strerror(err)); + rda->syslog(LOG_INFO,curl_easy_strerror(err)); } curl_slist_free_all(cmds); curl_easy_cleanup(curl); diff --git a/lib/rdlogplay.cpp b/lib/rdlogplay.cpp index 22ac91e8..4c038f1f 100644 --- a/lib/rdlogplay.cpp +++ b/lib/rdlogplay.cpp @@ -1936,7 +1936,7 @@ bool RDLogPlay::StartEvent(int line,RDLogLine::TransType trans_type, */ emit channelStarted(play_id,playdeck->channel(), playdeck->card(),playdeck->port()); - rda->syslog(LOG_DEBUG,"log engine: started audio cart: Line: %d Cart: %u Cut: %u Pos: %d Card: %d Stream: %d Port: %d", + rda->syslog(LOG_INFO,"log engine: started audio cart: Line: %d Cart: %u Cut: %u Pos: %d Card: %d Stream: %d Port: %d", line,logline->cartNumber(), playdeck->cut()->cutNumber(), logline->playPosition(), @@ -1991,14 +1991,14 @@ bool RDLogPlay::StartEvent(int line,RDLogLine::TransType trans_type, RDAirPlayConf::TrafficMacro,play_onair_flag); FinishEvent(line); emit transportChanged(); - rda->syslog(LOG_DEBUG, + rda->syslog(LOG_INFO, "log engine: asynchronously executed macro cart: Line: %d Cart: %u", line,logline->cartNumber()); } else { play_macro_deck->load(logline->cartNumber()); play_macro_deck->setLine(line); - rda->syslog(LOG_DEBUG, + rda->syslog(LOG_INFO, "log engine: started macro cart: Line: %d Cart: %u", line,logline->cartNumber()); play_macro_deck->exec(); @@ -2063,7 +2063,7 @@ bool RDLogPlay::StartEvent(int line,RDLogLine::TransType trans_type, } play_macro_deck->setLine(line); play_macro_deck->exec(); - rda->syslog(LOG_DEBUG,"log engine: chained to log: Line: %d Log: %s", + rda->syslog(LOG_INFO,"log engine: chained to log: Line: %d Log: %s", line,(const char *)logline->markerLabel()); break; @@ -2140,11 +2140,11 @@ void RDLogPlay::CleanupEvent(int id) } playdeck=(RDPlayDeck *)logline->playDeck(); if(playdeck->cut()==NULL) { - rda->syslog(LOG_DEBUG,"log engine: event failed: Line: %d Cart: %u",line, + rda->syslog(LOG_INFO,"log engine: event failed: Line: %d Cart: %u",line, logline->cartNumber()); } else { - rda->syslog(LOG_DEBUG,"log engine: finished event: Line: %d Cart: %u Cut: %u Card: %d Stream: %d Port: %d", + rda->syslog(LOG_INFO,"log engine: finished event: Line: %d Cart: %u Cut: %u Card: %d Stream: %d Port: %d", line,logline->cartNumber(), playdeck->cut()->cutNumber(), playdeck->card(), diff --git a/lib/rdpam.cpp b/lib/rdpam.cpp index ec3540b3..5e376458 100644 --- a/lib/rdpam.cpp +++ b/lib/rdpam.cpp @@ -48,12 +48,12 @@ int RDPamCallback(int num_msg, const struct pam_message **msg, break; case PAM_PROMPT_ECHO_ON: - rda->syslog(LOG_ERR,"unhandled PAM request: %s",msg[i]->msg); + rda->syslog(LOG_WARNING,"unhandled PAM request: %s",msg[i]->msg); break; case PAM_ERROR_MSG: case PAM_TEXT_INFO: - rda->syslog(LOG_NOTICE,"PAM message: %s",msg[i]->msg); + rda->syslog(LOG_INFO,"PAM message: %s",msg[i]->msg); break; } } @@ -80,7 +80,7 @@ bool RDPam::authenticate(const QString &username,const QString &token) conv.conv=RDPamCallback; conv.appdata_ptr=(RDPam *)this; if((err=pam_start(system_pam_service,username,&conv,&pamh))!=PAM_SUCCESS) { - rda->syslog(LOG_NOTICE,"PAM Error: %s",pam_strerror(pamh,err)); + rda->syslog(LOG_WARNING,"PAM Error: %s",pam_strerror(pamh,err)); pam_end(pamh,err); CleanupPam(); return false; diff --git a/rdcatchd/rdcatchd.cpp b/rdcatchd/rdcatchd.cpp index 8024ac12..cc700723 100644 --- a/rdcatchd/rdcatchd.cpp +++ b/rdcatchd/rdcatchd.cpp @@ -559,7 +559,7 @@ void MainObject::startTimerData(int id) BroadcastCommand(QString().sprintf("RE %d %d %d!", deck+1,catch_record_deck_status[deck], id)); - rda->syslog(LOG_DEBUG,"gpi start window closes: event: %d, gpi: %d:%d", + rda->syslog(LOG_INFO,"gpi start window closes: event: %d, gpi: %d:%d", id,catch_events[event].startMatrix(), catch_events[event].startLine()); } @@ -674,7 +674,7 @@ void MainObject::engineData(int id) catch_swdelay[catch_events[event].channel()-1]=q->value(5).toInt(); } else { - rda->syslog(LOG_DEBUG,"id %d specified non-existent record deck, ignored", + rda->syslog(LOG_INFO,"id %d specified non-existent record deck, ignored", catch_events[event].id()); delete q; return; @@ -707,7 +707,7 @@ void MainObject::engineData(int id) catch_record_deck_status[catch_events[event]. channel()-1], catch_events[event].id())); - rda->syslog(LOG_DEBUG,"gpi start window opens: event: %d, gpi: %d:%d", + rda->syslog(LOG_INFO,"gpi start window opens: event: %d, gpi: %d:%d", id,catch_events[event].startMatrix(), catch_events[event].startLine()); break; @@ -748,7 +748,7 @@ void MainObject::engineData(int id) q->value(2).toInt(); } else { - rda->syslog(LOG_DEBUG,"id %d specified non-existent play deck, ignored", + rda->syslog(LOG_INFO,"id %d specified non-existent play deck, ignored", catch_events[event].id()); delete q; return; @@ -1264,7 +1264,7 @@ bool MainObject::StartRecording(int event) QString str; str=rml->toString(); rda->ripc()->sendRml(rml); - rda->syslog(LOG_DEBUG,"sending switcher command: \"%s\"", + rda->syslog(LOG_INFO,"sending switcher command: \"%s\"", (const char *)str.toUtf8()); delete rml; } @@ -1411,7 +1411,7 @@ void MainObject::StartPlayout(int event) catch_playout_stream[deck-129]); catch_events[event].setStatus(RDDeck::Recording); - rda->syslog(LOG_DEBUG, + rda->syslog(LOG_INFO, "playout started: deck: %d, event %d card %d, stream %d , cut=%s", deck,catch_events[event].id(), catch_playout_card[deck-129], @@ -2238,25 +2238,25 @@ void MainObject::PurgeEvent(int event) BroadcastCommand(QString().sprintf("PE %d!",catch_events[event].id())); switch(catch_events[event].type()) { case RDRecording::Recording: - rda->syslog(LOG_DEBUG,"purged event %d, Type: recording, Cut: %s", + rda->syslog(LOG_INFO,"purged event %d, Type: recording, Cut: %s", catch_events[event].id(), (const char *)catch_events[event].cutName().toUtf8()); break; case RDRecording::Playout: - rda->syslog(LOG_DEBUG,"purged event %d, Type: playout, Cut: %s", + rda->syslog(LOG_INFO,"purged event %d, Type: playout, Cut: %s", catch_events[event].id(), (const char *)catch_events[event].cutName().toUtf8()); break; case RDRecording::MacroEvent: - rda->syslog(LOG_DEBUG,"purged event %d, Type: macro, Cart: %u", + rda->syslog(LOG_INFO,"purged event %d, Type: macro, Cart: %u", catch_events[event].id(), catch_events[event].macroCart()); break; case RDRecording::SwitchEvent: - rda->syslog(LOG_DEBUG, + rda->syslog(LOG_INFO, "purged event %d, Type: switch, Matrix: %d, Source: %d Dest: %d", catch_events[event].id(), catch_events[event].channel(), @@ -2265,13 +2265,13 @@ void MainObject::PurgeEvent(int event) break; case RDRecording::Download: - rda->syslog(LOG_DEBUG,"purged event %d, Type: download, Cut: %s", + rda->syslog(LOG_INFO,"purged event %d, Type: download, Cut: %s", catch_events[event].id(), (const char *)catch_events[event].cutName().toUtf8()); break; case RDRecording::Upload: - rda->syslog(LOG_DEBUG,"purged event %d, Type: upload, Cut: %s", + rda->syslog(LOG_INFO,"purged event %d, Type: upload, Cut: %s", catch_events[event].id(), (const char *)catch_events[event].cutName().toUtf8()); break; diff --git a/rdhpi/rdhpiplaystream.cpp b/rdhpi/rdhpiplaystream.cpp index e8d57637..d9ecbb0a 100644 --- a/rdhpi/rdhpiplaystream.cpp +++ b/rdhpi/rdhpiplaystream.cpp @@ -836,7 +836,7 @@ hpi_err_t RDHPIPlayStream::LogHpi(hpi_err_t err,int lineno) if(err!=0) { HPI_GetErrorText(err,err_txt); - RDApplication::syslog(sound_card->config(),LOG_NOTICE, + RDApplication::syslog(sound_card->config(),LOG_WARNING, "HPI Error: %s, %s line %d",err_txt,__FILE__,lineno); } return err; diff --git a/rdhpi/rdhpirecordstream.cpp b/rdhpi/rdhpirecordstream.cpp index 0eab96cf..986baf1c 100644 --- a/rdhpi/rdhpirecordstream.cpp +++ b/rdhpi/rdhpirecordstream.cpp @@ -740,7 +740,7 @@ hpi_err_t RDHPIRecordStream::LogHpi(hpi_err_t err,int lineno) if(err!=0) { HPI_GetErrorText(err,err_txt); - RDApplication::syslog(sound_card->config(),LOG_NOTICE, + RDApplication::syslog(sound_card->config(),LOG_WARNING, "HPI Error: %s, %s line %d",err_txt,__FILE__,lineno); } return err; diff --git a/rdhpi/rdhpisoundcard.cpp b/rdhpi/rdhpisoundcard.cpp index 4cac8e1f..4bb1b93e 100644 --- a/rdhpi/rdhpisoundcard.cpp +++ b/rdhpi/rdhpisoundcard.cpp @@ -1045,7 +1045,7 @@ hpi_err_t RDHPISoundCard::LogHpi(hpi_err_t err,int lineno) if(err!=0) { HPI_GetErrorText(err,err_txt); - RDApplication::syslog(card_config,LOG_NOTICE, + RDApplication::syslog(card_config,LOG_WARNING, "HPI Error: %s, %s line %d",err_txt,__FILE__,lineno); } return err; diff --git a/ripcd/am16.cpp b/ripcd/am16.cpp index 51cacb3c..c3420f11 100644 --- a/ripcd/am16.cpp +++ b/ripcd/am16.cpp @@ -235,16 +235,16 @@ void Am16::ProcessMessage(char *msg,int len) break; case 0x7E: - rda->syslog(LOG_NOTICE,"AM16 driver: data error"); + rda->syslog(LOG_WARNING,"AM16 driver: data error"); break; case 0x7F: - rda->syslog(LOG_NOTICE, + rda->syslog(LOG_WARNING, "AM16 driver: memory protect mode is on, cannot change crosspoints"); break; default: - rda->syslog(LOG_NOTICE,"AM16 driver: received unknown ACK code [%d]", + rda->syslog(LOG_WARNING,"AM16 driver: received unknown ACK code [%d]", 0xFF&msg[7]); break; } diff --git a/ripcd/btu41mlrweb.cpp b/ripcd/btu41mlrweb.cpp index 404f29ac..5ff7cc82 100644 --- a/ripcd/btu41mlrweb.cpp +++ b/ripcd/btu41mlrweb.cpp @@ -175,7 +175,7 @@ void BtU41MlrWeb::watchdogData() void BtU41MlrWeb::ProcessCommand(const QString &cmd) { - // rda->syslog(LOG_NOTICE,"ProcessCommand(%s)\n",(const char *)cmd); + // rda->syslog(LOG_DEBUG,"ProcessCommand(%s)\n",(const char *)cmd); QStringList cmds=cmd.split(","); diff --git a/ripcd/livewire_mcastgpio.cpp b/ripcd/livewire_mcastgpio.cpp index beea3bdb..7e2684f6 100644 --- a/ripcd/livewire_mcastgpio.cpp +++ b/ripcd/livewire_mcastgpio.cpp @@ -412,7 +412,7 @@ void LiveWireMcastGpio::ProcessGpoOut(int chan,unsigned line,bool state) htonl(livewire_surface_addresses[it->first].toIPv4Address()); } } - rda->syslog(LOG_NOTICE,"using %s", + rda->syslog(LOG_DEBUG,"using %s", (const char *)QHostAddress(ntohl(sa.sin_addr.s_addr)).toString()); */ diff --git a/ripcd/local_audio.cpp b/ripcd/local_audio.cpp index 89b2cffc..3f1466e0 100644 --- a/ripcd/local_audio.cpp +++ b/ripcd/local_audio.cpp @@ -368,7 +368,8 @@ hpi_err_t LocalAudio::LogHpi(hpi_err_t err,int lineno) if(err!=0) { HPI_GetErrorText(err,err_txt); - rda->syslog(LOG_NOTICE,"HPI Error: %s, %s line %d",err_txt,__FILE__,lineno); + rda->syslog(LOG_WARNING,"HPI Error: %s, %s line %d",err_txt, + __FILE__,lineno); } return err; } diff --git a/ripcd/local_macros.cpp b/ripcd/local_macros.cpp index 5a727bb4..8232f531 100644 --- a/ripcd/local_macros.cpp +++ b/ripcd/local_macros.cpp @@ -37,10 +37,10 @@ void MainObject::gpiChangedData(int matrix,int line,bool state) { if(state) { - rda->syslog(LOG_DEBUG,"GPI %d:%d ON",matrix,line+1); + rda->syslog(LOG_INFO,"GPI %d:%d ON",matrix,line+1); } else { - rda->syslog(LOG_DEBUG,"GPI %d:%d OFF",matrix,line+1); + rda->syslog(LOG_INFO,"GPI %d:%d OFF",matrix,line+1); } ripcd_gpi_state[matrix][line]=state; BroadcastCommand(QString().sprintf("GI %d %d %d %d!",matrix,line,state, @@ -58,10 +58,10 @@ void MainObject::gpiChangedData(int matrix,int line,bool state) void MainObject::gpoChangedData(int matrix,int line,bool state) { if(state) { - rda->syslog(LOG_DEBUG,"GPO %d:%d ON",matrix,line+1); + rda->syslog(LOG_INFO,"GPO %d:%d ON",matrix,line+1); } else { - rda->syslog(LOG_DEBUG,"GPO %d:%d OFF",matrix,line+1); + rda->syslog(LOG_INFO,"GPO %d:%d OFF",matrix,line+1); } ripcd_gpo_state[matrix][line]=state; BroadcastCommand(QString().sprintf("GO %d %d %d %d!",matrix,line,state, @@ -243,7 +243,7 @@ void MainObject::RunLocalMacros(RDMacro *rml_in) RDMatrix::GpioType gpio_type; QByteArray data; - rda->syslog(LOG_DEBUG,"received rml: \"%s\" from %s", + rda->syslog(LOG_INFO,"received rml: \"%s\" from %s", (const char *)rml_in->toString().toUtf8(), (const char *)rml_in->address().toString().toUtf8()); @@ -820,11 +820,11 @@ void MainObject::RunLocalMacros(RDMacro *rml_in) } if((rml->arg(0).toInt()==0)&&ripc_onair_flag) { BroadcastCommand("TA 0!"); - rda->syslog(LOG_DEBUG,"onair flag OFF"); + rda->syslog(LOG_INFO,"onair flag OFF"); } if((rml->arg(0).toInt()==1)&&(!ripc_onair_flag)) { BroadcastCommand("TA 1!"); - rda->syslog(LOG_DEBUG,"onair flag ON"); + rda->syslog(LOG_INFO,"onair flag ON"); } ripc_onair_flag=rml->arg(0).toInt(); if(rml->echoRequested()) { @@ -859,7 +859,7 @@ void MainObject::RunLocalMacros(RDMacro *rml_in) str+=(rml->arg(i)+" "); } str+=rml->arg(rml->argQuantity()-1); - rda->syslog(LOG_DEBUG,"sending \"%s\" to %s:%d",(const char *)str.toUtf8(), + rda->syslog(LOG_INFO,"sending \"%s\" to %s:%d",(const char *)str.toUtf8(), (const char *)addr.toString().toUtf8(),rml->arg(1).toInt()); data=RDStringToData(str); ripcd_rml_send->writeDatagram(data,addr,(Q_UINT16)(rml->arg(1).toInt())); diff --git a/ripcd/quartz1.cpp b/ripcd/quartz1.cpp index 27dd9527..7ef39313 100644 --- a/ripcd/quartz1.cpp +++ b/ripcd/quartz1.cpp @@ -213,7 +213,7 @@ void Quartz1::errorData(int conn,int err) { switch((Q3Socket::Error)err) { case Q3Socket::ErrConnectionRefused: - rda->syslog(LOG_NOTICE, + rda->syslog(LOG_WARNING, "connection to Quartz1 device at %s:%d refused, attempting reconnect", (const char *)sas_ipaddress[conn].toString().toUtf8(), sas_ipport[conn]); diff --git a/ripcd/ripcd.cpp b/ripcd/ripcd.cpp index 4c937ca4..5eb755f0 100644 --- a/ripcd/ripcd.cpp +++ b/ripcd/ripcd.cpp @@ -229,7 +229,7 @@ void MainObject::notificationReceivedData(const QString &msg, RDNotification *notify=new RDNotification(); if(!notify->read(msg)) { - rda->syslog(LOG_DEBUG,"invalid notification received from %s", + rda->syslog(LOG_INFO,"invalid notification received from %s", (const char *)addr.toString().toUtf8()); delete notify; return; @@ -507,7 +507,7 @@ bool MainObject::DispatchCommand(RipcdConnection *conn) msg=msg.left(msg.length()-1); RDNotification *notify=new RDNotification(); if(!notify->read(msg)) { - rda->syslog(LOG_DEBUG,"invalid notification processed"); + rda->syslog(LOG_INFO,"invalid notification processed"); delete notify; return true; } @@ -572,7 +572,7 @@ void MainObject::ReadRmlSocket(QUdpSocket *sock,RDMacro::Role role, } } else { - rda->syslog(LOG_DEBUG, + rda->syslog(LOG_INFO, "rejected rml: \"%s\": on-air flag not active",buffer); break; } @@ -593,7 +593,7 @@ void MainObject::ReadRmlSocket(QUdpSocket *sock,RDMacro::Role role, } } else { - rda->syslog(LOG_DEBUG,"received malformed rml: \"%s\" from %s:%u", + rda->syslog(LOG_INFO,"received malformed rml: \"%s\" from %s:%u", buffer, (const char *)sock->peerAddress().toString().toUtf8(), sock->peerPort()); diff --git a/ripcd/sas16000.cpp b/ripcd/sas16000.cpp index 4372f407..e17f01f6 100644 --- a/ripcd/sas16000.cpp +++ b/ripcd/sas16000.cpp @@ -117,7 +117,7 @@ void Sas16000::processCommand(RDMacro *cmd) void Sas16000::SendCommand(char *str) { - rda->syslog(LOG_DEBUG,"sending USI cmd: %s", + rda->syslog(LOG_INFO,"sending USI cmd: %s", (const char *)PrettifyCommand(str)); sas_device->writeBlock(str,strlen(str)); diff --git a/ripcd/sasusi.cpp b/ripcd/sasusi.cpp index c820ca75..dc747eed 100644 --- a/ripcd/sasusi.cpp +++ b/ripcd/sasusi.cpp @@ -299,7 +299,7 @@ void SasUsi::processCommand(RDMacro *cmd) if(sas_relay_numbers[cmd->arg(2).toUInt()-1]>=0) { snprintf(str,256,"\x05R%d%04d\x0D\x0A",cmd_byte, sas_relay_numbers[cmd->arg(2).toUInt()-1]); - rda->syslog(LOG_NOTICE,"USI: %s", + rda->syslog(LOG_DEBUG,"USI: %s", (const char *)PrettifyCommand(str)); SendCommand(str); cmd->acknowledge(true); @@ -418,7 +418,7 @@ void SasUsi::errorData(int err) void SasUsi::SendCommand(char *str) { - rda->syslog(LOG_DEBUG,"sending USI cmd: %s", + rda->syslog(LOG_INFO,"sending USI cmd: %s", (const char *)PrettifyCommand(str)); switch(sas_porttype) { case RDMatrix::TtyPort: @@ -476,7 +476,7 @@ void SasUsi::DispatchCommand() } } - rda->syslog(LOG_DEBUG,"received USI cmd: %s", + rda->syslog(LOG_INFO,"received USI cmd: %s", (const char *)PrettifyCommand(sas_buffer)); diff --git a/ripcd/switcher.cpp b/ripcd/switcher.cpp index d5dc4ec7..b357b1fe 100644 --- a/ripcd/switcher.cpp +++ b/ripcd/switcher.cpp @@ -82,7 +82,7 @@ void Switcher::logBytes(uint8_t *data,int len) for(int i=0;isyslog(LOG_NOTICE,"bytes: %s",(const char *)str); + rda->syslog(LOG_INFO,"bytes: %s",(const char *)str); } diff --git a/ripcd/vguest.cpp b/ripcd/vguest.cpp index 1d00efc8..82bbe969 100644 --- a/ripcd/vguest.cpp +++ b/ripcd/vguest.cpp @@ -760,7 +760,7 @@ void VGuest::MetadataCommand(char *cmd,int len,int id) vguest_ping_response_timer[id]->stop(); } else { - rda->syslog(LOG_DEBUG, + rda->syslog(LOG_INFO, "vGuest system at %s understands ping, activating timeout monitoring", (const char *)vguest_ipaddress[id].toString().toUtf8()); } diff --git a/web/rdxport/tests.cpp b/web/rdxport/tests.cpp index 94cb143f..b41bb8f1 100644 --- a/web/rdxport/tests.cpp +++ b/web/rdxport/tests.cpp @@ -50,7 +50,7 @@ void Xport::SaveString() // // Process Request // - rda->syslog(LOG_NOTICE,"SAVESTRING: |%s|",(const char *)string.utf8()); + rda->syslog(LOG_INFO,"SAVESTRING: |%s|",(const char *)string.utf8()); printf("Content-type: application/xml; charset: UTF-8\n"); printf("Status: 200\n\n"); printf("\n");