mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-11-05 16:43:54 +01:00
Master (#6)
* Fixed bug where wrong ID was used for local maintenance * Updated ChangeLog * Added ability to run macros from cart list with "Run Macro" button * Updated ChangeLog * Updated translations * 2018-10-18 Fred Gleason <fredg@paravelsystems.com> * Tweaked the position of buttons on the bottom row of the main screen of rdlibrary(1). * Changed the minimum size of the main screen of rdlibrary to 850x600. * 2018-10-18 Fred Gleason <fredg@paravelsystems.com> * Fixed a regression in rdmaint(8) that broke cut rehashing. * 2018-10-19 Fred Gleason <fredg@paravelsystems.com> * Added code in the %post and %preun rules in 'rivendell.spec.in' to enable and disable the 'rivendell' service. * 2018-10-19 Fred Gleason <fredg@paravelsystems.com> * Modified rdservice(8) to log errors to syslog. * Added an rdservice(8) man page. * Modified 'systemd/rivendell.service.in' to enable automatic start retries. * 2018-10-19 Fred Gleason <fredg@paravelsystems.com> * Fixed a typo that broke generation of the rmlsend(1) man page. * 2018-10-19 Fred Gleason <fredg@paravelsystems.com> * Removed 'build_win32.bat'. * Removed all conditional compilation based on 'WIN32'. * 2018-10-19 Fred Gleason <fredg@paravelsystems.com> * Removed check for Win32 installer from 'configure.ac'. * Removed win32 clauses from '.pro' files.
This commit is contained in:
committed by
GitHub
parent
48bbe8ee67
commit
4a3106c8dc
@@ -47,8 +47,6 @@
|
||||
MainObject::MainObject(QObject *parent)
|
||||
:QObject(parent)
|
||||
{
|
||||
QString sql;
|
||||
RDSqlQuery *q;
|
||||
QString err_msg;
|
||||
|
||||
//
|
||||
@@ -92,23 +90,22 @@ MainObject::MainObject(QObject *parent)
|
||||
}
|
||||
|
||||
//
|
||||
// Get User
|
||||
// RIPC Connection
|
||||
//
|
||||
sql="select LOGIN_NAME from USERS where ADMIN_CONFIG_PRIV=\"Y\"";
|
||||
q=new RDSqlQuery(sql);
|
||||
if(!q->first()) {
|
||||
fprintf(stderr,"unable to find valid user\n");
|
||||
exit(256);
|
||||
}
|
||||
delete q;
|
||||
connect(rda,SIGNAL(userChanged()),this,SLOT(userData()));
|
||||
rda->ripc()->
|
||||
connectHost("localhost",RIPCD_TCP_PORT,rda->config()->password());
|
||||
}
|
||||
|
||||
|
||||
void MainObject::userData()
|
||||
{
|
||||
if(maint_system) {
|
||||
RunSystemMaintenance();
|
||||
}
|
||||
else {
|
||||
RunLocalMaintenance();
|
||||
}
|
||||
|
||||
exit(0);
|
||||
}
|
||||
|
||||
@@ -358,7 +355,6 @@ void MainObject::RehashCuts()
|
||||
sql="select CUT_NAME from CUTS where SHA1_HASH is null limit 100";
|
||||
q=new RDSqlQuery(sql);
|
||||
while(q->next()) {
|
||||
printf("CUT: %s\n",(const char *)q->value(0).toString());
|
||||
if((err=RDRehash::rehash(rda->station(),rda->user(),rda->config(),
|
||||
RDCut::cartNumber(q->value(0).toString()),
|
||||
RDCut::cutNumber(q->value(0).toString())))!=RDRehash::ErrorOk) {
|
||||
@@ -369,9 +365,11 @@ void MainObject::RehashCuts()
|
||||
(const char *)RDRehash::errorText(err)));
|
||||
|
||||
}
|
||||
if(maint_verbose) {
|
||||
fprintf(stderr,"rehashed cut \"%s\"\n",
|
||||
(const char *)q->value(0).toString());
|
||||
else {
|
||||
if(maint_verbose) {
|
||||
fprintf(stderr,"rehashed cut \"%s\"\n",
|
||||
(const char *)q->value(0).toString());
|
||||
}
|
||||
}
|
||||
sleep(1);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user