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

db/upnp: remove "upnplog" option

Browse Source 
We have removed all libupnp logging calls, and we don't need to debug
libupnp.
This commit is contained in:
Max Kellermann 2014-01-10 22:42:02 +01:00
parent 1091ca969f
commit 48097745f6
3 changed files with 2 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/db/UpnpDatabasePlugin.cxx
View File

@ -63,7 +63,6 @@ class UpnpDatabase : public Database {
LibUPnP *m_lib;
UPnPDeviceDirectory *m_superdir;
Directory *m_root;
std::string m_upnplog;
public:
UpnpDatabase()
@ -194,9 +193,8 @@ UpnpDatabase::Create(const config_param &param, Error &error)
}
bool
UpnpDatabase::Configure(const config_param& param, Error&)
UpnpDatabase::Configure(const config_param &, Error &)
{
m_upnplog = param.GetBlockValue("upnplog", "");
return true;
}
@ -225,9 +223,6 @@ bool UpnpDatabase::reallyOpen(Error &error)
if (!m_lib)
return false;
if (!m_upnplog.empty()) {
m_lib->setLogFileName(m_upnplog);
}
m_superdir = UPnPDeviceDirectory::getTheDir();
if (!m_superdir || !m_superdir->ok()) {
error.Set(upnp_domain, "Discovery services startup failed");

31
src/db/upnp/upnpplib.cxx
View File

@ -20,16 +20,10 @@
#include "config.h"
#include "upnpplib.hxx"
#include "Domain.hxx"
#include "Util.hxx"
#include "Log.hxx"
#include <string>
#include <map>
#include <vector>
#include <set>
#include <upnp/ixml.h>
#include <upnp/upnpdebug.h>
#include <upnp/upnptools.h>
static LibUPnP *theLib;
@ -58,9 +52,6 @@ LibUPnP::LibUPnP()
}
setMaxContentLength(2000*1024);
#ifdef DEBUG
UpnpCloseLog();
#endif
code = UpnpRegisterClient(o_callback, (void *)this, &m_clh);
if (code != UPNP_E_SUCCESS) {
@ -79,26 +70,6 @@ void LibUPnP::setMaxContentLength(int bytes)
UpnpSetMaxContentLength(bytes);
}
bool LibUPnP::setLogFileName(const std::string& fn)
{
const ScopeLock protect(m_mutex);
if (fn.empty()) {
UpnpCloseLog();
} else {
UpnpSetLogLevel(UPNP_INFO);
UpnpSetLogFileNames(fn.c_str(), fn.c_str());
int code = UpnpInitLog();
if (code != UPNP_E_SUCCESS) {
FormatError(upnp_domain, "UpnpInitLog() failed: %s",
UpnpGetErrorMessage(code));
return false;
}
}
return true;
}
void
LibUPnP::registerHandler(Upnp_EventType et, Upnp_FunPtr handler, void *cookie)
{

8
src/db/upnp/upnpplib.hxx
View File

@ -23,11 +23,9 @@
#include "thread/Mutex.hxx"
#include "util/Error.hxx"
#include <string>
#include <map>
#include <upnp/upnp.h>
#include <upnp/upnptools.h>
/** Our link to libupnp. Initialize and keep the handle around */
class LibUPnP {
@ -58,12 +56,6 @@ public:
/** Retrieve the singleton LibUPnP object */
static LibUPnP *getLibUPnP(Error &error);
/** Set log file name and activate logging.
*
* @param fn file name to use. Use empty string to turn logging off
*/
bool setLogFileName(const std::string& fn);
/** Set max library buffer size for reading content from servers.
* The default is 200k and should be ok */
void setMaxContentLength(int bytes);