diff options
| author | Kevron Rees <kevron.m.rees@intel.com> | 2013-12-10 16:45:47 -0800 |
|---|---|---|
| committer | Kevron Rees <kevron.m.rees@intel.com> | 2013-12-10 16:45:59 -0800 |
| commit | 2b4309d749099ab4b98761ecea3638326ab1a8a5 (patch) | |
| tree | f07a8dc728fac3d8265da279fd0d737745696b52 | |
| parent | a1fb86ee2f666bf45627b48d3221c85f88cca0b5 (diff) | |
| download | automotive-message-broker-2b4309d749099ab4b98761ecea3638326ab1a8a5.tar.gz | |
added dbus method debug info to manager interface
| -rw-r--r-- | examples/dbusconfig | 2 | ||||
| -rw-r--r-- | lib/vehicleproperty.cpp | 2 | ||||
| -rw-r--r-- | plugins/dbus/abstractdbusinterface.cpp | 4 | ||||
| -rw-r--r-- | plugins/dbus/abstractdbusinterface.h | 2 | ||||
| -rw-r--r-- | plugins/dbus/automotivemanager.cpp | 6 |
5 files changed, 10 insertions, 6 deletions
diff --git a/examples/dbusconfig b/examples/dbusconfig index 502f21a8..761cf9f9 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 8b7f3626..ec75ae73 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 4c0f7a0c..aedbaa3c 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 76e143d6..ffbfb704 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 304a54fc..58526df0 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; |