Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-08-16 08:34:12 +02:00
Code Issues Projects Releases Wiki Activity

2019-04-01 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a race in rdservice(8) that could cause a deadlock
	when starting on a system with many dropboxes configured.
	* Fixed a bug in rdadmin(1) that caused a spurious error message
	when started on a system with the 'rivendell' service inactive.
This commit is contained in:
Fred Gleason 2019-04-01 14:48:17 -04:00
parent dee0f5d168
commit a7cfb26a92
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -18560,3 +18560,8 @@
Guide. Guide.
2019-03-28 Fred Gleason <fredg@paravelsystems.com> 2019-03-28 Fred Gleason <fredg@paravelsystems.com>
* Fixed a typo in the remarks in 'apis/pypad/scripts/pypad_serial.py'. * Fixed a typo in the remarks in 'apis/pypad/scripts/pypad_serial.py'.
2019-04-01 Fred Gleason <fredg@paravelsystems.com>
* Fixed a race in rdservice(8) that could cause a deadlock
when starting on a system with many dropboxes configured.
* Fixed a bug in rdadmin(1) that caused a spurious error message
when started on a system with the 'rivendell' service inactive.

2
rdadmin/rdadmin.cpp
View File

@ -111,7 +111,7 @@ MainWidget::MainWidget(QWidget *parent)
// Open the Database // Open the Database
// //
rda=new RDApplication("RDAdmin","rdadmin",RDADMIN_USAGE,this); rda=new RDApplication("RDAdmin","rdadmin",RDADMIN_USAGE,this);
if(!rda->open(&err_msg,&err_type)) { if(!rda->open(&err_msg,&err_type,false)) {
if(err_type!=RDApplication::ErrorNoHostEntry) { if(err_type!=RDApplication::ErrorNoHostEntry) {
QMessageBox::critical(this,"RDAdmin - "+tr("Error"),err_msg); QMessageBox::critical(this,"RDAdmin - "+tr("Error"),err_msg);
exit(1); exit(1);

3
rdservice/rdservice.cpp
View File

@ -55,6 +55,7 @@ MainObject::MainObject(QObject *parent)
:QObject(parent) :QObject(parent)
{ {
QString err_msg; QString err_msg;
RDApplication::ErrorType err_type=RDApplication::ErrorOk;
// //
// Open the syslog // Open the syslog
@ -73,7 +74,7 @@ MainObject::MainObject(QObject *parent)
// Open the Database // Open the Database
// //
rda=new RDApplication("rdservice","rdservice","\n\n",this); rda=new RDApplication("rdservice","rdservice","\n\n",this);
if(!rda->open(&err_msg)) { if(!rda->open(&err_msg,&err_type,false)) {
syslog(LOG_ERR,"unable to open database [%s]", syslog(LOG_ERR,"unable to open database [%s]",
(const char *)err_msg.utf8()); (const char *)err_msg.utf8());
exit(2); exit(2);