Projet

Général

Profil

Révision e54c4474

IDe54c4474fa8099b8c35039019c94ea5559e15ccb
Parent 70b2815d
Enfant 0af7f438

Ajouté par Sebastian Liechti il y a plus de 5 ans

Fix checking curl

Voir les différences:

plugins/jitsi_videobridge/jitsi_videobridge
45 45

  
46 46
COLIBRI_URL=${url:-"http://127.0.0.1:8080/colibri/stats"}
47 47

  
48
get_json_data() {
49
    echo $(curl -s -f -m 2 "$COLIBRI_URL")
50
}
51

  
52 48
case $1 in
53 49

  
54 50
    autoconf)
55 51
        if [ -x /usr/bin/curl ]; then
56 52
            if [ -x /usr/bin/jq ]; then
57
                get_json_data || echo "no (no valid env.url)" && exit 0
58
                echo "yes"
59
                exit 0
53
	        curl -s -f -m 2 -I "$COLIBRI_URL" > /dev/null && echo "yes" && exit 0 || echo "no (no valid env.url)" && exit 0
60 54
            else
61
                echo "no (jq not found)"
62
                exit 0
55
                echo "no (jq not found)" && exit 0
63 56
            fi
64 57
        else
65
            echo "no (/usr/bin/curl not found)"
66
            exit 0
58
            echo "no (/usr/bin/curl not found)" && exit 0
67 59
        fi
68 60
        ;;
69 61

  
......
120 112

  
121 113
esac
122 114

  
123
JSONSTATS=$(get_json_data)
115
JSONSTATS=$(curl -s -f -m 2 "$COLIBRI_URL")
124 116

  
125 117
echo "multigraph jitsi_videobridge_sessions"
126 118
for KEY in videochannels audiochannels videostreams conferences participants; do

Formats disponibles : Unified diff