oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

db/proxy: make connect errors during startup non-fatal

Browse Source
This commit is contained in:
Max Kellermann
2017-01-23 18:48:04 +01:00
parent f01eb2f95d
commit e78ab767d3
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -3,6 +3,7 @@ ver 0.20.3 (not yet released)
- "playlistadd" creates new playlist if it does not exist, as documented - "playlistadd" creates new playlist if it does not exist, as documented
* database * database
- proxy: fix error "terminate called after throwing ..." - proxy: fix error "terminate called after throwing ..."
- proxy: make connect errors during startup non-fatal
* replay gain: don't reset ReplayGain levels when unpausing playback * replay gain: don't reset ReplayGain levels when unpausing playback
* silence surround channels when converting from stereo * silence surround channels when converting from stereo
* use shortcuts such as "dsd64" in log messages * use shortcuts such as "dsd64" in log messages

10
src/db/plugins/ProxyDatabasePlugin.cxx
View File

@@ -346,9 +346,15 @@ ProxyDatabase::Create(EventLoop &loop, DatabaseListener &listener,
void void
ProxyDatabase::Open() ProxyDatabase::Open()
{ {
Connect();
update_stamp = 0; update_stamp = 0;
try {
Connect();
} catch (const std::runtime_error &error) {
/* this error is non-fatal, because this plugin will
attempt to reconnect again automatically */
LogError(error);
}
} }
void void