Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/bluez:add-debug-option into ~snappy-hwe-team/snappy-hwe-snaps/+git/bluez:snap-20

[Alfonso Sanchez-Beato]

Add wrapper script for bluetoothd

Add wrapper script for bluetoothd so we can enable debug traces if the
debug.enable snap option is set.

Add wrapper script for bluetoothd

Add wrapper script for bluetoothd so we can enable debug traces if the
debug.enable snap option is set.

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: d7c0d484b481d72d7cc714e55b84ffa29d23c0b7

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1447/

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:d7c0d484b481d72d7cc714e55b84ffa29d23c0b7
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/633/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/664
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/664
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/664
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/664
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1447
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1189
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1246/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/633/rebuild

review: Approve (continuous-integration)

[Philip Meulengracht (the-meulengracht)]

Looks fine to me, approved

review: Approve

diff --git a/bin/bluetoothd-wrapper b/bin/bluetoothd-wrapper
 new file mode 100755
index 0000000..0d02e17
--- /dev/null
+++ b/bin/bluetoothd-wrapper
@@ -0,0 +1,22 @@
+#!/bin/sh -e
+#
+# Copyright (C) 2021 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+DEBUG=
+if [ -f "$SNAP_DATA"/.debug_enabled ]; then
+    DEBUG="-d"
+fi
+
+exec "$SNAP"/usr/lib/bluetooth/bluetoothd -E $DEBUG
diff --git a/snap/hooks/configure b/snap/hooks/configure
 new file mode 100755
index 0000000..a2a4359
--- /dev/null
+++ b/snap/hooks/configure
@@ -0,0 +1,32 @@
+#!/bin/sh -e
+#
+# Copyright (C) 2021 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# $1 true/false for enabling/disabling debug log level
+switch_debug_enable() {
+    DEBUG_FILE=$SNAP_DATA/.debug_enabled
+    if [ "$1" = "true" ]; then
+        touch "$DEBUG_FILE"
+    else
+        rm -f "$DEBUG_FILE"
+    fi
+}
+
+value=$(snapctl get debug.enable)
+if [ -z "$value" ]; then
+    value="false"
+    snapctl set debug.enable="$value"
+fi
+switch_debug_enable "$value"
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 85a4d30..9c2e4d2 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -26,7 +26,7 @@ apps:
     command: bin/client-wrapper usr/bin/obexctl
     plugs: [client]
   bluez:
-    command: "usr/lib/bluetooth/bluetoothd -E"
+    command: bin/bluetoothd-wrapper
     daemon: simple
     slots: [service]
     plugs: [uhid, uinput, kernel-crypto-api]
@@ -77,6 +77,7 @@ parts:
     source: bin/
     organize:
       client-wrapper: bin/client-wrapper
+      bluetoothd-wrapper: bin/bluetoothd-wrapper
 
   changelog:
     plugin: nil
diff --git a/tests/main/debug-log/task.yaml b/tests/main/debug-log/task.yaml
 new file mode 100644
index 0000000..9465408
--- /dev/null
+++ b/tests/main/debug-log/task.yaml
@@ -0,0 +1,20 @@
+summary: Verify that the debug traces can be enabled/disabled
+
+execute: |
+    . $TESTSLIB/utilities.sh
+
+    state=$(snap get bluez debug.enable)
+    test "$state" = false
+    pgrep --full "bluetoothd -E$"
+
+    snap set bluez debug.enable=true
+    state=$(snap get bluez debug.enable)
+    test "$state" = true
+    snap restart bluez
+    pgrep --full "bluetoothd -E -d$"
+
+    snap set bluez debug.enable=false
+    state=$(snap get bluez debug.enable)
+    test "$state" = false
+    snap restart bluez
+    pgrep --full "bluetoothd -E$"