summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/contentDirectory.cpp2
-rw-r--r--server/server.cpp10
-rw-r--r--server/webserver.cpp3
3 files changed, 9 insertions, 6 deletions
diff --git a/server/contentDirectory.cpp b/server/contentDirectory.cpp
index 9b30c5f..45fecff 100644
--- a/server/contentDirectory.cpp
+++ b/server/contentDirectory.cpp
@@ -76,7 +76,7 @@ int cContentDirectory::Subscribe(Upnp_Subscription_Request* Request){
void cContentDirectory::Action(){
int Retry = 5;
- dsyslog("UPnP\tStart Content directory thread");
+ LOG(5, "Start Content directory thread");
while(this->Running()){
IXML_Document* PropertySet = NULL;
diff --git a/server/server.cpp b/server/server.cpp
index 3780d7a..2bac18a 100644
--- a/server/server.cpp
+++ b/server/server.cpp
@@ -192,7 +192,7 @@ bool cMediaServer::Initialize(){
int ret = 0;
- isyslog("UPnP\tInitializing UPnP media server on %s:%d", address.c_str(), port);
+ LOG(1, "Initializing UPnP media server on %s:%d", address.c_str(), port);
ret = UpnpInit(address.c_str(), mCurrentConfiguration.port);
@@ -201,6 +201,8 @@ bool cMediaServer::Initialize(){
return false;
}
+ isyslog("UPnP\tInitialized UPnP media server on %s:%d", UpnpGetServerIpAddress(), UpnpGetServerPort());
+
mWebserver = new cWebserver(GetServerIPAddress());
mMediaManager = new cMediaManager();
@@ -295,7 +297,7 @@ cMediaServer::serviceMap& cMediaServer::GetServices(){
void cMediaServer::RegisterService(cUPnPService* service){
if(service != NULL){
- dsyslog("UPnP\tRegistered service: %s", service->GetServiceDescription().serviceType.c_str());
+ LOG(1, "Registered service: %s", service->GetServiceDescription().serviceType.c_str());
GetServices()[service->GetServiceDescription().serviceID] = service;
}
}
@@ -318,7 +320,7 @@ int cMediaServer::ActionCallback(Upnp_EventType eventtype, void *event, void *co
case UPNP_CONTROL_ACTION_REQUEST:
actionRequest = (Upnp_Action_Request*) event;
- dsyslog("UPnP\tAction request: %s", actionRequest->ActionName);
+ LOG(3, "Action request: %s", actionRequest->ActionName);
if(!mediaServer->CheckDeviceUUID(actionRequest->DevUDN)){
esyslog("UPnP\tUPnP Callback - action request not for this device");
@@ -337,7 +339,7 @@ int cMediaServer::ActionCallback(Upnp_EventType eventtype, void *event, void *co
case UPNP_EVENT_SUBSCRIPTION_REQUEST:
eventRequest = (Upnp_Subscription_Request*) event;
- dsyslog("UPnP\tSubscription request from: %s", eventRequest->ServiceId);
+ LOG(3, "Subscription request from: %s", eventRequest->ServiceId);
if(!mediaServer->CheckDeviceUUID(eventRequest->UDN)){
esyslog("UPnP\tUPnP Callback - event request not for this device");
diff --git a/server/webserver.cpp b/server/webserver.cpp
index c4f39d8..0c6d1b6 100644
--- a/server/webserver.cpp
+++ b/server/webserver.cpp
@@ -6,6 +6,7 @@
*/
#include "../include/webserver.h"
+#include "../include/tools.h"
#include "../upnp.h"
#include <signal.h>
#include <sstream>
@@ -172,7 +173,7 @@ void cWebserver::cWSThread::Action(){
try {
if(Running()){
mWebserver.mApplication.run();
- dsyslog("UPnP\tStarted web server thread.");
+ LOG(3, "Started web server thread.");
}
} catch (const std::exception& e){
esyslog("UPnP\tError while starting web server: %s", e.what());