From 08489b21be435f5eb304eda529ffc248622c20eb Mon Sep 17 00:00:00 2001
From: Valentin Lab <valentin.lab@kalysto.org>
Date: Sat, 23 Jan 2016 13:55:15 +0700
Subject: [PATCH] chg: a few cosmetic changes in logs !minor

---
 bin/compose | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/compose b/bin/compose
index 6ccc770..7982bb5 100755
--- a/bin/compose
+++ b/bin/compose
@@ -285,7 +285,7 @@ get_docker_compose () {
     ##
 
     declare -A entries
-    debug "Compiling 'docker-compose.conf' for $DARKYELLOW$@$NORMAL..."
+    debug "Compiling 'docker-compose.conf' base for $DARKYELLOW$@$NORMAL..."
     for target_service in "$@"; do
         services=$(get_ordered_service_dependencies "$target_service") || return 1
         debug "$DARKYELLOW$target_service$NORMAL deps:$DARKYELLOW" $services "$NORMAL"
@@ -840,8 +840,8 @@ _run_service_relation () {
                 export SERVICE_NAME DOCKER_BASE_IMAGE SERVICE_DATASTORE SERVICE_CONFIGSTORE
                 "$script_name"
                 echo "$?" > "$relation_dir/target_errlvl"
-            ) | logstdout "$DARKYELLOW$target_charm$NORMAL/$base_script_name ${GREEN}@${NORMAL}"
-        } 3>&1 1>&2 2>&3 | logstderr "$DARKYELLOW$target_charm$NORMAL/$base_script_name ${RED}@${NORMAL}" 3>&1 1>&2 2>&3
+            ) | logstdout "$DARKYELLOW$target_charm$NORMAL/$DARKBLUE$relation_name$NORMAL (joined) ${GREEN}@${NORMAL}"
+        } 3>&1 1>&2 2>&3 | logstderr "$DARKYELLOW$target_charm$NORMAL/$DARKBLUE$relation_name$NORMAL (joined) ${RED}@${NORMAL}" 3>&1 1>&2 2>&3
         target_errlvl="$(cat "$relation_dir/target_errlvl")" || {
             err "Relation script '$script_name' in $DARKYELLOW$target_charm$NORMAL" \
                 "failed before outputing an errorlevel."
@@ -873,8 +873,8 @@ _run_service_relation () {
                     export SERVICE_NAME DOCKER_BASE_IMAGE SERVICE_DATASTORE SERVICE_CONFIGSTORE
                     "$script_name"
                     echo "$?" > "$relation_dir/errlvl"
-                ) | logstdout "$DARKYELLOW$charm$NORMAL/$base_script_name ${GREEN}@${NORMAL}"
-            } 3>&1 1>&2 2>&3 | logstderr "$DARKYELLOW$charm$NORMAL/$base_script_name ${RED}@$NORMAL" 3>&1 1>&2 2>&3
+                ) | logstdout "$DARKYELLOW$charm$NORMAL/$DARKBLUE$relation_name$NORMAL (joined) ${GREEN}@${NORMAL}"
+            } 3>&1 1>&2 2>&3 | logstderr "$DARKYELLOW$charm$NORMAL/$DARKBLUE$relation_name$NORMAL (joined) ${RED}@$NORMAL" 3>&1 1>&2 2>&3
             errlvl="$(cat "$relation_dir/errlvl")" || {
                 err "Relation script '$script_name' in $DARKYELLOW$charm$NORMAL" \
                     "failed before outputing an errorlevel."