f83b66898d6fd20237ca8b8b1e922424e4876cad
configuration/getCPUOfLeaderboards.sh
| ... | ... | @@ -8,22 +8,23 @@ |
| 8 | 8 | BASE_URL="${1}" |
| 9 | 9 | BEARER_TOKEN="${2}" |
| 10 | 10 | FIRST=1 |
| 11 | -JSON_OUTPUT='['`curl -L "${BASE_URL}/sailingserver/api/v1/leaderboards" 2>/dev/null | jq -r '.[]' | while read lb; do |
|
| 12 | - url="${BASE_URL}/sailingserver/api/v1/leaderboards/$( echo -n "${lb}" | jq -sRr @uri )/cpu" |
|
| 11 | +JSON_OUTPUT='['`curl -L "${BASE_URL}/sailingserver/api/v1/leaderboards" 2>/dev/null | jq '.[]' | while read lb; do |
|
| 12 | +url="${BASE_URL}/sailingserver/api/v1/leaderboards/$( echo -n "${lb}" | sed -e 's/^"//' -e 's/"$//' | jq -sRr @uri )/cpu" |
|
| 13 | 13 | if [ "${FIRST}" != "1" ]; then |
| 14 | 14 | echo -n ", " |
| 15 | 15 | else |
| 16 | 16 | FIRST=0 |
| 17 | 17 | fi |
| 18 | 18 | if [ -z "${BEARER_TOKEN}" ]; then |
| 19 | - LEADERBOARD_CPU_JSON=$( curl -L "${url}" 2>/dev/null ) |
|
| 19 | + LEADERBOARD_CPU_JSON=$( curl -H 'X-SAPSSE-Forward-Request-To: master' -L "${url}" 2>/dev/null ) |
|
| 20 | 20 | else |
| 21 | - LEADERBOARD_CPU_JSON=$( curl -L -H 'Authorization: Bearer '${BEARER_TOKEN} "${url}" 2>/dev/null ) |
|
| 21 | + LEADERBOARD_CPU_JSON=$( curl -H 'X-SAPSSE-Forward-Request-To: master' -H 'Authorization: Bearer '${BEARER_TOKEN} -L "${url}" 2>/dev/null ) |
|
| 22 | 22 | fi |
| 23 | 23 | if ! echo "${LEADERBOARD_CPU_JSON}" | grep -q "Subject does not have permission \[LEADERBOARD:UPDATE"; then |
| 24 | - echo -n "{\"leaderboard\": \"${lb}\", \"cpu\": ${LEADERBOARD_CPU_JSON}}" |
|
| 24 | + echo -n "{\"leaderboard\": \"$( echo -n "${lb}" | sed -e 's/^"//' -e 's/"$//' )\", \"cpu\": ${LEADERBOARD_CPU_JSON}}" |
|
| 25 | 25 | else |
| 26 | 26 | FIRST=1 |
| 27 | 27 | fi |
| 28 | 28 | done`']' |
| 29 | -echo "${JSON_OUTPUT}" | jq -C 'sort_by(.cpu.totals.cpuTotalMillis) | reverse' | less -R |
|
| 29 | +#echo "${JSON_OUTPUT}" | jq -C 'sort_by(.cpu.totals.cpuTotalMillis) | reverse' | less -R |
|
| 30 | +echo "${JSON_OUTPUT}" |