From 2b4309d749099ab4b98761ecea3638326ab1a8a5 Mon Sep 17 00:00:00 2001
From: Kevron Rees <kevron.m.rees@intel.com>
Date: Tue, 10 Dec 2013 16:45:47 -0800
Subject: [PATCH] added dbus method debug info to manager interface

---
 examples/dbusconfig                    | 2 +-
 lib/vehicleproperty.cpp                | 2 +-
 plugins/dbus/abstractdbusinterface.cpp | 4 ----
 plugins/dbus/abstractdbusinterface.h   | 2 ++
 plugins/dbus/automotivemanager.cpp     | 6 ++++++
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/examples/dbusconfig b/examples/dbusconfig
index 502f21a..761cf9f 100644
--- a/examples/dbusconfig
+++ b/examples/dbusconfig
@@ -3,7 +3,7 @@
 		{
 			"name" : "ExampleSouce",
 			"path" : "/usr/lib/automotive-message-broker/examplesourceplugin.so",
-			"delay" : "24"
+			"delay" : "1000"
 		}
 	],
 	"sinks": [
diff --git a/lib/vehicleproperty.cpp b/lib/vehicleproperty.cpp
index 8b7f362..ec75ae7 100644
--- a/lib/vehicleproperty.cpp
+++ b/lib/vehicleproperty.cpp
@@ -342,7 +342,7 @@ bool VehicleProperty::registerPropertyPriv(VehicleProperty::Property name, Vehic
 {
 	if(ListPlusPlus<Property>(&mCapabilities).contains(name))
 	{
-		DebugOut(0)<<__FUNCTION__<<" ERROR: property '"<<name<<"'' already registered."<<endl;
+		DebugOut(0)<<__FUNCTION__<<" ERROR: property '"<<name<<"' already registered."<<endl;
 		return false;
 	}
 
diff --git a/plugins/dbus/abstractdbusinterface.cpp b/plugins/dbus/abstractdbusinterface.cpp
index 4c0f7a0..aedbaa3 100644
--- a/plugins/dbus/abstractdbusinterface.cpp
+++ b/plugins/dbus/abstractdbusinterface.cpp
@@ -54,10 +54,6 @@ const uint getPid(const char *owner)
 		throw std::runtime_error(error->message);
 	}
 
-	const char* p = g_variant_get_type_string(pid);
-
-	DebugOut()<<"pid "<<p<<endl;
-
 	uint thePid=0;
 
 	g_variant_get(pid,"(u)",&thePid);
diff --git a/plugins/dbus/abstractdbusinterface.h b/plugins/dbus/abstractdbusinterface.h
index 76e143d..ffbfb70 100644
--- a/plugins/dbus/abstractdbusinterface.h
+++ b/plugins/dbus/abstractdbusinterface.h
@@ -31,6 +31,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class AbstractProperty;
 
+const uint getPid(const char *owner);
+
 class AbstractDBusInterface
 {
 
diff --git a/plugins/dbus/automotivemanager.cpp b/plugins/dbus/automotivemanager.cpp
index 304a54f..58526df 100644
--- a/plugins/dbus/automotivemanager.cpp
+++ b/plugins/dbus/automotivemanager.cpp
@@ -41,6 +41,12 @@ static void handleMethodCall(GDBusConnection       *connection,
 
 	std::string method = method_name;
 
+	if(DebugOut::getDebugThreshhold() >= 6)
+	{
+		DebugOut(6)<<"DBus method call from: "<<sender<< " pid: " <<getPid(sender)<< " interface: "<<interface_name<<" method: "<<method<<endl;
+		DebugOut(6)<<"DBus method call path: "<<object_path<<endl;
+	}
+
 	if(method == "findProperty")
 	{
 		DebugOut(DebugOut::Warning)<<"org.automotive.Manager.findProperty() is deprecated.  Use org.automotive.Manager.FindObject() instead."<<endl;
-- 
2.7.4