Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-29 23:22:35 +02:00
Code Issues Projects Releases Wiki Activity

2017-12-20 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Cleaned up 'log in use" messages in rdlogedit(1) and
	rdclilogedit(1).
This commit is contained in:
Fred Gleason 2017-12-20 18:31:16 -05:00
parent aec8bba723
commit 0224380581
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -16530,3 +16530,6 @@
* Added a 'LOGS.LOCK_GUID' field to the database. * Added a 'LOGS.LOCK_GUID' field to the database.
* Incremented the database version to 274. * Incremented the database version to 274.
* Added a 'LockLog' call to the Web API. * Added a 'LockLog' call to the Web API.
2017-12-20 Fred Gleason <fredg@paravelsystems.com>
* Cleaned up 'log in use" messages in rdlogedit(1) and
rdclilogedit(1).

10
rdlogedit/edit_log.cpp
View File

@ -649,10 +649,12 @@ int EditLog::exec()
QHostAddress addr; QHostAddress addr;
if(!edit_log_lock->tryLock(&username,&stationname,&addr)) { if(!edit_log_lock->tryLock(&username,&stationname,&addr)) {
QMessageBox::warning(this,"RDLogEdit - "+tr("Log Locked"), QString msg=tr("Log already being edited by")+" "+username+"@"+stationname;
tr("Log already being edited by")+" "+ if(stationname!=addr.toString()) {
username+"@"+stationname+" ["+ msg+=" ["+addr.toString()+"]";
addr.toString()+"]."); }
msg+=".";
QMessageBox::warning(this,"RDLogEdit - "+tr("Log Locked"),msg);
return false; return false;
} }

10
utils/rdclilogedit/rdclilogedit.cpp
View File

@ -153,11 +153,11 @@ bool MainObject::TryLock(RDLogLock *lock,const QString &logname)
ret=lock->tryLock(&username,&stationname,&addr); ret=lock->tryLock(&username,&stationname,&addr);
if(!ret) { if(!ret) {
fprintf(stderr,"log \"%s\" in use by %s@%s [%s]\n", QString msg="log \""+logname+"\" in use by "+username+"@"+stationname;
(const char *)logname, if(stationname!=addr.toString()) {
(const char *)username, msg+=" ["+addr.toString()+"]";
(const char *)stationname, }
(const char *)addr.toString()); fprintf(stderr,"%s\n",(const char *)msg);
} }
return ret; return ret;
} }