Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-12 23:55:56 +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

26
utils/rddbconfig/rddbconfig.cpp
View File

@@ -29,9 +29,10 @@
#include <qmessagebox.h>
#include <q3filedialog.h>
#include "rdconfig.h"
#include "rdpaths.h"
#include "dbversion.h"
#include <dbversion.h>
#include <rdapplication.h>
#include <rdconfig.h>
#include <rdpaths.h>
#include "../../icons/rivendell-22x22.xpm"
@@ -204,9 +205,12 @@ void MainWidget::mismatchData()
}
else {
QMessageBox::information(this,"Database Modified Successfully",
QString().sprintf("Modified database to version %d", RD_VERSION_DATABASE));
QString().sprintf("Modified database to version %d",
RD_VERSION_DATABASE));
}
syslog(LOG_INFO,"modified database to version %d",RD_VERSION_DATABASE);
RDApplication::syslog(rd_config,LOG_INFO,
"modified database to version %d",
RD_VERSION_DATABASE);
emit dbChanged();
}
@@ -330,9 +334,9 @@ void MainWidget::backupData()
QString().sprintf("Backed up %s database to %s",
(const char *)rd_config->mysqlDbname(),
(const char *)filename));
syslog(LOG_INFO,"backed up %s database to %s",
(const char *)rd_config->mysqlDbname(),
(const char *)filename);
RDApplication::syslog(rd_config,LOG_INFO,"backed up %s database to %s",
(const char *)rd_config->mysqlDbname(),
(const char *)filename);
}
}
}
@@ -380,9 +384,9 @@ void MainWidget::restoreData()
QString().sprintf("Restored %s database from %s",
(const char *)rd_config->mysqlDbname(),
(const char *)filename));
syslog(LOG_INFO,"restored %s database from %s",
(const char *)rd_config->mysqlDbname(),
(const char *)filename);
RDApplication::syslog(rd_config,LOG_INFO,"restored %s database from %s",
(const char *)rd_config->mysqlDbname(),
(const char *)filename);
}
emit updateLabels();
startDaemons();

4
utils/rdimport/rdimport.cpp
View File

@@ -2,7 +2,7 @@
//
// A Batch Importer for Rivendell.
//
// (C) Copyright 2002-2014,2016-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -2025,7 +2025,7 @@ void MainObject::Log(int prio,const QString &msg) const
QString m=msg;
if (import_drop_box||import_log_syslog||import_log_file) {
syslog(prio,m.replace(QRegExp("^rdimport: "),"").simplified());
rda->syslog(prio,m.replace(QRegExp("^rdimport: "),"").simplified());
}
else {
if(prio==LOG_ERR) {

20
utils/rdmaint/rdmaint.cpp
View File

@@ -166,12 +166,12 @@ void MainObject::PurgeCuts()
RDCart *cart=new RDCart(q1->value(0).toUInt());
if(cart->removeCut(rda->station(),rda->user(),q1->value(1).toString(),
rda->config())) {
syslog(LOG_INFO,"purged cut %s",
(const char *)q1->value(1).toString().toUtf8());
rda->syslog(LOG_INFO,"purged cut %s",
(const char *)q1->value(1).toString().toUtf8());
}
else {
syslog(LOG_WARNING,"unable to purge cut %s: audio deletion error",
(const char *)q1->value(1).toString().toUtf8());
rda->syslog(LOG_WARNING,"unable to purge cut %s: audio deletion error",
(const char *)q1->value(1).toString().toUtf8());
}
if(q->value(2).toString()=="Y") { // Delete Empty Cart
sql=QString("select CUT_NAME from CUTS where ")+
@@ -179,7 +179,7 @@ void MainObject::PurgeCuts()
q2=new RDSqlQuery(sql);
if(!q2->first()) {
cart->remove(rda->station(),rda->user(),rda->config());
syslog(LOG_INFO,"deleted purged cart %06u",cart->number());
rda->syslog(LOG_INFO,"deleted purged cart %06u",cart->number());
}
delete q2;
}
@@ -203,8 +203,8 @@ void MainObject::PurgeLogs()
"(PURGE_DATE<\""+dt.date().toString("yyyy-MM-dd")+"\")";
q=new RDSqlQuery(sql);
while(q->next()) {
syslog(LOG_INFO,"purged log %s",
(const char *)q->value(0).toString().toUtf8());
rda->syslog(LOG_INFO,"purged log %s",
(const char *)q->value(0).toString().toUtf8());
RDLog *log=new RDLog(q->value(0).toString());
log->remove(rda->station(),rda->user(),rda->config());
delete log;
@@ -363,9 +363,9 @@ void MainObject::RehashCuts()
if((err=RDRehash::rehash(rda->station(),rda->user(),rda->config(),
RDCut::cartNumber(q->value(0).toString()),
RDCut::cutNumber(q->value(0).toString())))!=RDRehash::ErrorOk) {
syslog(LOG_WARNING,"failed to rehash cut %s [%s]",
(const char *)q->value(0).toString().toUtf8(),
(const char *)RDRehash::errorText(err).toUtf8());
rda->syslog(LOG_WARNING,"failed to rehash cut %s [%s]",
(const char *)q->value(0).toString().toUtf8(),
(const char *)RDRehash::errorText(err).toUtf8());
}
else {

7
utils/rdpopup/rdpopup.cpp
View File

@@ -28,10 +28,11 @@
#include <qdatetime.h>
#include <rd.h>
#include <rdapplication.h>
#include <rdcmd_switch.h>
#include <rdconfig.h>
#include <rdpopup.h>
#include "rdpopup.h"
//
// Icons
@@ -74,7 +75,7 @@ int main(int argc,char *argv[])
}
//
// Open the syslog
// Open the config
//
RDConfig *config=new RDConfig();
config->load();
@@ -128,7 +129,7 @@ int main(int argc,char *argv[])
mb->exec();
delete mb;
syslog(LOG_INFO,"\"%s\" acknowledged",argv[argc-1]);
RDApplication::syslog(config,LOG_INFO,"\"%s\" acknowledged",argv[argc-1]);
closelog();
return 0;