From 3936d6afc0b6c46cef27bd4a05a7599ca9a86460 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Tue, 29 Dec 2020 23:16:29 +0100 Subject: [PATCH] Merge logs/multilogs and avoid multitail external --- CHANGELOG.md | 1 + abra | 167 ++++++++++++++++++++++++--------------------------- 2 files changed, 79 insertions(+), 89 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2436a6a8..fb9d934f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # abra x.x.x (UNRELEASED) +- Drop `multilogs` command ([#56](https://git.autonomic.zone/coop-cloud/abra/pulls/56)) - Remove `server use` command ([#51](https://git.autonomic.zone/coop-cloud/abra/issues/51)) - `new ` becomes `new ` ([#48](https://git.autonomic.zone/coop-cloud/abra/issues/48)) - `check` is run on `deploy` now and configurable ([77ba5652b2fe15820f5edfa0f642636f7b8eae7e](https://git.autonomic.zone/coop-cloud/abra/commit/77ba5652b2fe15820f5edfa0f642636f7b8eae7e)) diff --git a/abra b/abra index 1f2447ea..b77463f2 100755 --- a/abra +++ b/abra @@ -18,7 +18,6 @@ Usage: abra [options] app config abra [options] app (delete|rm) [--force] abra [options] app logs [] - abra [options] app multilogs abra [options] app cp abra [options] app check abra [options] app ps @@ -144,13 +143,13 @@ eval "var_$1+=($value)"; else eval "var_$1=$value"; fi; return 0; fi; done return 1; }; stdout() { printf -- "cat <<'EOM'\n%s\nEOM\n" "$1"; }; stderr() { printf -- "cat <<'EOM' >&2\n%s\nEOM\n" "$1"; }; error() { [[ -n $1 ]] && stderr "$1"; stderr "$usage"; _return 1; }; _return() { -printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:1560} -usage=${DOC:40:1252}; digest=30845 -shorts=(-s -v -e -h '' '' '' '' '' '' '' '' '' '') -longs=(--stack --version --env --help --server --domain --pass --auto --status --skip-check --force --no-tty --user --all) -argcounts=(1 0 1 0 1 1 0 0 0 0 0 0 1 0); node_0(){ value __stack 0; }; node_1(){ -switch __version 1; }; node_2(){ value __env 2; }; node_3(){ switch __help 3; } -node_4(){ value __server 4; }; node_5(){ value __domain 5; }; node_6(){ +printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:1520} +usage=${DOC:40:1212}; digest=7df47 +shorts=(-e -h -v -s '' '' '' '' '' '' '' '' '' '') +longs=(--env --help --version --stack --server --domain --pass --auto --status --skip-check --force --no-tty --user --all) +argcounts=(1 0 0 1 1 1 0 0 0 0 0 0 1 0); node_0(){ value __env 0; }; node_1(){ +switch __help 1; }; node_2(){ switch __version 2; }; node_3(){ value __stack 3 +}; node_4(){ value __server 4; }; node_5(){ value __domain 5; }; node_6(){ switch __pass 6; }; node_7(){ switch __auto 7; }; node_8(){ switch __status 8; } node_9(){ switch __skip_check 9; }; node_10(){ switch __force 10; }; node_11(){ switch __no_tty 11; }; node_12(){ value __user 12; }; node_13(){ switch __all 13 @@ -163,63 +162,61 @@ value _user_ a; }; node_27(){ value _port_ a; }; node_28(){ _command app; } node_29(){ _command new; }; node_30(){ _command list; }; node_31(){ _command ls }; node_32(){ _command deploy; }; node_33(){ _command undeploy; }; node_34(){ _command config; }; node_35(){ _command delete; }; node_36(){ _command rm; } -node_37(){ _command logs; }; node_38(){ _command multilogs; }; node_39(){ -_command cp; }; node_40(){ _command check; }; node_41(){ _command ps; } -node_42(){ _command run; }; node_43(){ _command secret; }; node_44(){ -_command auto; }; node_45(){ _command generate; }; node_46(){ _command insert; } -node_47(){ _command server; }; node_48(){ _command add; }; node_49(){ -_command init; }; node_50(){ _command apps; }; node_51(){ _command upgrade; } -node_52(){ optional 0 1 2 3; }; node_53(){ optional 52; }; node_54(){ optional 4 -}; node_55(){ optional 5; }; node_56(){ optional 6; }; node_57(){ optional 7; } -node_58(){ required 53 28 29 54 55 56 57 14; }; node_59(){ either 30 31; } -node_60(){ required 59; }; node_61(){ optional 8; }; node_62(){ -required 53 28 60 61 54; }; node_63(){ optional 9; }; node_64(){ -required 53 28 15 32 63; }; node_65(){ required 53 28 15 33; }; node_66(){ -required 53 28 15 34; }; node_67(){ either 35 36; }; node_68(){ required 67; } -node_69(){ optional 10; }; node_70(){ required 53 28 15 68 69; }; node_71(){ -optional 16; }; node_72(){ required 53 28 15 37 71; }; node_73(){ -required 53 28 15 38; }; node_74(){ required 53 28 15 39 17 18; }; node_75(){ -required 53 28 15 40; }; node_76(){ required 53 28 15 41; }; node_77(){ -optional 11; }; node_78(){ optional 12; }; node_79(){ oneormore 19; } -node_80(){ required 53 28 15 42 77 78 16 79; }; node_81(){ -required 53 28 15 42 16 79; }; node_82(){ required 53 28 15 43 44 56; } -node_83(){ optional 22; }; node_84(){ required 53 28 15 43 45 20 21 83 56; } -node_85(){ required 53 28 15 43 46 20 21 23 56; }; node_86(){ either 20 13; } -node_87(){ required 86; }; node_88(){ required 53 28 15 43 68 87 56 69; } -node_89(){ optional 79; }; node_90(){ required 53 28 15 24 89; }; node_91(){ -optional 26; }; node_92(){ optional 27; }; node_93(){ required 53 47 48 25 91 92 -}; node_94(){ required 53 47 60; }; node_95(){ required 53 47 25 36; } -node_96(){ required 53 47 25 49; }; node_97(){ required 53 47 25 50 61; } -node_98(){ required 53 51; }; node_99(){ -either 58 62 64 65 66 70 72 73 74 75 76 80 81 82 84 85 88 90 93 94 95 96 97 98 -}; node_100(){ required 99; }; cat <<<' docopt_exit() { -[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1252}" >&2 -exit 1; }'; unset var___stack var___version var___env var___help var___server \ +node_37(){ _command logs; }; node_38(){ _command cp; }; node_39(){ +_command check; }; node_40(){ _command ps; }; node_41(){ _command run; } +node_42(){ _command secret; }; node_43(){ _command auto; }; node_44(){ +_command generate; }; node_45(){ _command insert; }; node_46(){ _command server +}; node_47(){ _command add; }; node_48(){ _command init; }; node_49(){ +_command apps; }; node_50(){ _command upgrade; }; node_51(){ optional 0 1 2 3; } +node_52(){ optional 51; }; node_53(){ optional 4; }; node_54(){ optional 5; } +node_55(){ optional 6; }; node_56(){ optional 7; }; node_57(){ +required 52 28 29 53 54 55 56 14; }; node_58(){ either 30 31; }; node_59(){ +required 58; }; node_60(){ optional 8; }; node_61(){ required 52 28 59 60 53; } +node_62(){ optional 9; }; node_63(){ required 52 28 15 32 62; }; node_64(){ +required 52 28 15 33; }; node_65(){ required 52 28 15 34; }; node_66(){ +either 35 36; }; node_67(){ required 66; }; node_68(){ optional 10; } +node_69(){ required 52 28 15 67 68; }; node_70(){ optional 16; }; node_71(){ +required 52 28 15 37 70; }; node_72(){ required 52 28 15 38 17 18; }; node_73(){ +required 52 28 15 39; }; node_74(){ required 52 28 15 40; }; node_75(){ +optional 11; }; node_76(){ optional 12; }; node_77(){ oneormore 19; } +node_78(){ required 52 28 15 41 75 76 16 77; }; node_79(){ +required 52 28 15 41 16 77; }; node_80(){ required 52 28 15 42 43 55; } +node_81(){ optional 22; }; node_82(){ required 52 28 15 42 44 20 21 81 55; } +node_83(){ required 52 28 15 42 45 20 21 23 55; }; node_84(){ either 20 13; } +node_85(){ required 84; }; node_86(){ required 52 28 15 42 67 85 55 68; } +node_87(){ optional 77; }; node_88(){ required 52 28 15 24 87; }; node_89(){ +optional 26; }; node_90(){ optional 27; }; node_91(){ required 52 46 47 25 89 90 +}; node_92(){ required 52 46 59; }; node_93(){ required 52 46 25 36; } +node_94(){ required 52 46 25 48; }; node_95(){ required 52 46 25 49 60; } +node_96(){ required 52 50; }; node_97(){ +either 57 61 63 64 65 69 71 72 73 74 78 79 80 82 83 86 88 91 92 93 94 95 96; } +node_98(){ required 97; }; cat <<<' docopt_exit() { +[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1212}" >&2 +exit 1; }'; unset var___env var___help var___version var___stack var___server \ var___domain var___pass var___auto var___status var___skip_check var___force \ var___no_tty var___user var___all var__type_ var__domain_ var__service_ \ var__src_ var__dst_ var__args_ var__secret_ var__version_ var__cmd_ var__data_ \ var__command_ var__host_ var__user_ var__port_ var_app var_new var_list var_ls \ -var_deploy var_undeploy var_config var_delete var_rm var_logs var_multilogs \ -var_cp var_check var_ps var_run var_secret var_auto var_generate var_insert \ -var_server var_add var_init var_apps var_upgrade; parse 100 "$@" -local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__stack" \ -"${prefix}__version" "${prefix}__env" "${prefix}__help" "${prefix}__server" \ -"${prefix}__domain" "${prefix}__pass" "${prefix}__auto" "${prefix}__status" \ -"${prefix}__skip_check" "${prefix}__force" "${prefix}__no_tty" \ -"${prefix}__user" "${prefix}__all" "${prefix}_type_" "${prefix}_domain_" \ -"${prefix}_service_" "${prefix}_src_" "${prefix}_dst_" "${prefix}_args_" \ -"${prefix}_secret_" "${prefix}_version_" "${prefix}_cmd_" "${prefix}_data_" \ -"${prefix}_command_" "${prefix}_host_" "${prefix}_user_" "${prefix}_port_" \ -"${prefix}app" "${prefix}new" "${prefix}list" "${prefix}ls" "${prefix}deploy" \ -"${prefix}undeploy" "${prefix}config" "${prefix}delete" "${prefix}rm" \ -"${prefix}logs" "${prefix}multilogs" "${prefix}cp" "${prefix}check" \ -"${prefix}ps" "${prefix}run" "${prefix}secret" "${prefix}auto" \ -"${prefix}generate" "${prefix}insert" "${prefix}server" "${prefix}add" \ -"${prefix}init" "${prefix}apps" "${prefix}upgrade" -eval "${prefix}"'__stack=${var___stack:-}' -eval "${prefix}"'__version=${var___version:-false}' +var_deploy var_undeploy var_config var_delete var_rm var_logs var_cp var_check \ +var_ps var_run var_secret var_auto var_generate var_insert var_server var_add \ +var_init var_apps var_upgrade; parse 98 "$@"; local prefix=${DOCOPT_PREFIX:-''} +unset "${prefix}__env" "${prefix}__help" "${prefix}__version" \ +"${prefix}__stack" "${prefix}__server" "${prefix}__domain" "${prefix}__pass" \ +"${prefix}__auto" "${prefix}__status" "${prefix}__skip_check" \ +"${prefix}__force" "${prefix}__no_tty" "${prefix}__user" "${prefix}__all" \ +"${prefix}_type_" "${prefix}_domain_" "${prefix}_service_" "${prefix}_src_" \ +"${prefix}_dst_" "${prefix}_args_" "${prefix}_secret_" "${prefix}_version_" \ +"${prefix}_cmd_" "${prefix}_data_" "${prefix}_command_" "${prefix}_host_" \ +"${prefix}_user_" "${prefix}_port_" "${prefix}app" "${prefix}new" \ +"${prefix}list" "${prefix}ls" "${prefix}deploy" "${prefix}undeploy" \ +"${prefix}config" "${prefix}delete" "${prefix}rm" "${prefix}logs" \ +"${prefix}cp" "${prefix}check" "${prefix}ps" "${prefix}run" "${prefix}secret" \ +"${prefix}auto" "${prefix}generate" "${prefix}insert" "${prefix}server" \ +"${prefix}add" "${prefix}init" "${prefix}apps" "${prefix}upgrade" eval "${prefix}"'__env=${var___env:-}' eval "${prefix}"'__help=${var___help:-false}' +eval "${prefix}"'__version=${var___version:-false}' +eval "${prefix}"'__stack=${var___stack:-}' eval "${prefix}"'__server=${var___server:-}' eval "${prefix}"'__domain=${var___domain:-}' eval "${prefix}"'__pass=${var___pass:-false}' @@ -250,7 +247,6 @@ eval "${prefix}"'undeploy=${var_undeploy:-false}' eval "${prefix}"'config=${var_config:-false}' eval "${prefix}"'delete=${var_delete:-false}' eval "${prefix}"'rm=${var_rm:-false}'; eval "${prefix}"'logs=${var_logs:-false}' -eval "${prefix}"'multilogs=${var_multilogs:-false}' eval "${prefix}"'cp=${var_cp:-false}' eval "${prefix}"'check=${var_check:-false}' eval "${prefix}"'ps=${var_ps:-false}'; eval "${prefix}"'run=${var_run:-false}' @@ -264,8 +260,8 @@ eval "${prefix}"'init=${var_init:-false}' eval "${prefix}"'apps=${var_apps:-false}' eval "${prefix}"'upgrade=${var_upgrade:-false}'; local docopt_i=1 [[ $BASH_VERSION =~ ^4.3 ]] && docopt_i=2; for ((;docopt_i>0;docopt_i--)); do -declare -p "${prefix}__stack" "${prefix}__version" "${prefix}__env" \ -"${prefix}__help" "${prefix}__server" "${prefix}__domain" "${prefix}__pass" \ +declare -p "${prefix}__env" "${prefix}__help" "${prefix}__version" \ +"${prefix}__stack" "${prefix}__server" "${prefix}__domain" "${prefix}__pass" \ "${prefix}__auto" "${prefix}__status" "${prefix}__skip_check" \ "${prefix}__force" "${prefix}__no_tty" "${prefix}__user" "${prefix}__all" \ "${prefix}_type_" "${prefix}_domain_" "${prefix}_service_" "${prefix}_src_" \ @@ -274,10 +270,9 @@ declare -p "${prefix}__stack" "${prefix}__version" "${prefix}__env" \ "${prefix}_user_" "${prefix}_port_" "${prefix}app" "${prefix}new" \ "${prefix}list" "${prefix}ls" "${prefix}deploy" "${prefix}undeploy" \ "${prefix}config" "${prefix}delete" "${prefix}rm" "${prefix}logs" \ -"${prefix}multilogs" "${prefix}cp" "${prefix}check" "${prefix}ps" \ -"${prefix}run" "${prefix}secret" "${prefix}auto" "${prefix}generate" \ -"${prefix}insert" "${prefix}server" "${prefix}add" "${prefix}init" \ -"${prefix}apps" "${prefix}upgrade"; done; } +"${prefix}cp" "${prefix}check" "${prefix}ps" "${prefix}run" "${prefix}secret" \ +"${prefix}auto" "${prefix}generate" "${prefix}insert" "${prefix}server" \ +"${prefix}add" "${prefix}init" "${prefix}apps" "${prefix}upgrade"; done; } # docopt parser above, complete command for generating this parser is `docopt.sh abra` PROGRAM_NAME=$(basename "$0") @@ -456,6 +451,22 @@ parse_secret() { sub_app_secret_generate } +stack_logs (){ + # Note(decentral1se): see https://github.com/moby/moby/issues/31458#issuecomment-617871046 + STACK="$1" + + services=$(docker stack services "${STACK}" --format "{{.ID}}") + + # shellcheck disable=SC2154 + trap 'jobs=$(jobs -p) && test -n "$jobs" && kill $jobs' EXIT + + for item in ${services//\\n/$'\n'}; do + docker service logs -f -t --tail 10 "$item" & + done + + sleep infinity +} + ####################################### # abra app .. ####################################### @@ -836,27 +847,6 @@ sub_app_run(){ return } -###### .. app multilogs -sub_app_multilogs() { - # Inspired by https://github.com/moby/moby/issues/31458#issuecomment-475411564 - require_multitail - - load_instance - load_instance_env - - # Get a list of the service names - SERVICES=$(docker stack services --format "{{.Name}}" "${STACK_NAME}") - # Sort the service names - SERVICES=$(echo "${SERVICES}" | sort) - # Create the command to run - COMMAND='multitail --mergeall' - for SERVICE in ${SERVICES}; do - COMMAND="${COMMAND} -L 'docker service logs --tail 20 -f ${SERVICE}'" - done - # Run the command - bash -c "${COMMAND}" -} - ###### .. app logs ... sub_app_logs (){ load_instance @@ -865,8 +855,7 @@ sub_app_logs (){ SERVICE="${abra__service_}" if [ -z "$SERVICE" ]; then - warning "No \$SERVICE provided, running multilogs" - sub_app_multilogs + stack_logs "${STACK_NAME}" return fi