Browse Source

Add debug logging

Joachim M. Giæver 3 years ago
parent
commit
3a680a7701
4 changed files with 34 additions and 0 deletions
  1. 9 0
      scripts/hooks/configure
  2. 9 0
      scripts/hooks/connect-plug-configurations
  3. 10 0
      scripts/hooks/install
  4. 6 0
      snap/snapcraft.yaml

+ 9 - 0
scripts/hooks/configure

@@ -2,6 +2,15 @@
 
 set -e 
 
+logger "Configure snap!"
+
+if [ ! -f "${SNAP_DATA}/settings.conf" ]; then
+    logger "Settings-file is missing"
+    exit 1
+else
+    logger "Settings.conf exists, continue configure"
+fi
+
 snapctl get server | $SNAP/bin/update-settings "${SNAP_DATA}/settings.conf" update
 snapctl restart "${SNAP_NAME}.server"
 exit $?

+ 9 - 0
scripts/hooks/connect-plug-configurations

@@ -1,5 +1,14 @@
 #!/usr/bin/env bash
 set -e
+logger "Connect plug!"
+
+if [ ! -f "${SNAP_DATA}/settings.conf" ]; then
+    logger "Settings-file is missing"
+    exit 1
+else
+    logger "Settings.conf exists, continue plug:configurations"
+fi
+
 snapctl set server.basepath.dir="${SNAP_COMMON}/configurations"
 snapctl set server.basepath.enforce=True
 snapctl get server | $SNAP/bin/update-settings "${SNAP_DATA}/settings.conf" update

+ 10 - 0
scripts/hooks/install

@@ -1,8 +1,18 @@
 #!/usr/bin/env bash
 
 set -e
+
+logger "Copying ${SNAP}/settings.conf to ${SNAP_DATA}/settings.conf"
 cp "${SNAP}/settings.conf" "${SNAP_DATA}/settings.conf"
 
+if [ $? -ne 0 ]; then
+    logger "Failed moving settings.conf!"
+    exit 1
+else
+    logger "Moved settings.conf successfully!"
+fi
+
+logger "Read initial settings to snap"
 $SNAP/bin/update-settings "${SNAP_DATA}/settings.conf" "install" | while read LINE; do
     logger "${LINE}"
     snapctl set "${LINE}"

+ 6 - 0
snap/snapcraft.yaml

@@ -89,11 +89,17 @@ parts:
       snapcraftctl build
       cp ${SNAPCRAFT_PART_BUILD}/settings.conf ${SNAPCRAFT_PART_INSTALL}/settings.conf
   scripts:
+    after:
+      - configurator
     plugin: dump
     source: ./scripts
     source-type: local
     organize:
       hooks: snap/hooks
+    # stage:
+    #   - lib
+    #   - usr
+    #   - etc
     stage-packages:
       - uuid
       - libossp-uuid16