From 3abe93673adbf9055fb248795890a716d8415565 Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Wed, 5 Feb 2014 11:52:28 +1000 Subject: [PATCH] [connectionagent] add tracing package like connman's So it is easier to start debug output --- config/connectionagent.service | 3 ++- connd/qconnectionmanager.cpp | 2 ++ connectionagent.pro | 3 ++- rpm/connectionagent-qt5.spec | 21 +++++++++++++++++++++ rpm/connectionagent.tracing | 1 + 5 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 rpm/connectionagent.tracing diff --git a/config/connectionagent.service b/config/connectionagent.service index 6371922..9be56d0 100644 --- a/config/connectionagent.service +++ b/config/connectionagent.service @@ -4,7 +4,8 @@ Requires=dbus.service After=pre-user-session.target [Service] -ExecStart=/usr/bin/connectionagent +EnvironmentFile=-/etc/tracing/connectionagent/connectionagent.tracing +ExecStart=/usr/bin/connectionagent $TRACING Type=dbus BusName=com.jolla.Connectiond Restart=always diff --git a/connd/qconnectionmanager.cpp b/connd/qconnectionmanager.cpp index b73a00b..293d36c 100644 --- a/connd/qconnectionmanager.cpp +++ b/connd/qconnectionmanager.cpp @@ -787,6 +787,8 @@ void QConnectionManager::techChanged() void QConnectionManager::browserRequest(const QString &servicePath, const QString &url) { Q_UNUSED(servicePath) + qDebug() << servicePath; + qDebug() << url; Q_EMIT requestBrowser(url); } diff --git a/connectionagent.pro b/connectionagent.pro index 14e7307..c26477b 100644 --- a/connectionagent.pro +++ b/connectionagent.pro @@ -14,6 +14,7 @@ equals(QT_MAJOR_VERSION, 5): { SUBDIRS += connd OTHER_FILES += rpm/connectionagent-qt5.spec \ - rpm/connectionagent-qt5.yaml + rpm/connectionagent-qt5.yaml \ + rpm/connectionagent.tracing } diff --git a/rpm/connectionagent-qt5.spec b/rpm/connectionagent-qt5.spec index ebccccf..077a256 100644 --- a/rpm/connectionagent-qt5.spec +++ b/rpm/connectionagent-qt5.spec @@ -15,6 +15,7 @@ Group: Communications/Connectivity Adaptation License: LGPLv2 URL: http://github.com/lpotter/connectionagent Source0: %{name}-%{version}.tar.bz2 +Source1: connectionagent.tracing Source100: connectionagent-qt5.yaml Requires: connman-qt5-declarative Requires: systemd @@ -52,6 +53,15 @@ Requires: %{name} = %{version} %description test This package contains the auto tests for connection agent. +%package tracing +Summary: Configuration for Connectionagent to enable tracing +Group: Development/Tools +Requires: %{name} = %{version}-%{release} + +%description tracing +Will enable tracing for Connectionagent + + %prep %setup -q -n %{name}-%{version} @@ -75,6 +85,10 @@ rm -rf %{buildroot} # << install pre %qmake5_install +%make_install +mkdir -p %{buildroot}%{_sysconfdir}/tracing/connectionagent/ +cp -a %{SOURCE1} %{buildroot}%{_sysconfdir}/tracing/connectionagent/ + # >> install post mkdir -p %{buildroot}%{_libdir}/systemd/user/user-session.target.wants ln -s ../connectionagent.service %{buildroot}%{_libdir}/systemd/user/user-session.target.wants/ @@ -117,3 +131,10 @@ fi %{_prefix}/opt/tests/libqofono/* # >> files test # << files test + +%files tracing +%defattr(-,root,root,-) +%config %{_sysconfdir}/tracing/connectionagent +# >> files tracing +# << files tracing + diff --git a/rpm/connectionagent.tracing b/rpm/connectionagent.tracing new file mode 100644 index 0000000..79ab67c --- /dev/null +++ b/rpm/connectionagent.tracing @@ -0,0 +1 @@ +TRACING=-d