Merge pull request #188 from github/use-ghe-redis-cli

Replace redis-cli with ghe-redis-cli

Author: jlisam

share/github-backup-utils/ghe-backup-redis

@@ -22,21 +22,21 @@ ghe-ssh "$GHE_HOSTNAME" /bin/bash <<EOF
   set -e
 
   redis_host=\$(ghe-config cluster.redis-master 2>/dev/null || echo "localhost")
-  timestamp=\$(redis-cli -h \$redis_host LASTSAVE)
+  timestamp=\$(ghe-redis-cli --remote -h \$redis_host LASTSAVE)
 
   for i in \$(seq 10); do
-    if ! redis-cli -h \$redis_host BGSAVE | grep -q ERR; then
+    if ! ghe-redis-cli --remote -h \$redis_host BGSAVE | grep -q ERR; then
       break
     fi
     sleep 15
   done
   for n in \$(seq 3600); do
-    if [ "\$(redis-cli -h \$redis_host LASTSAVE)" != "\$timestamp" ]; then
+    if [ "\$(ghe-redis-cli --remote -h \$redis_host LASTSAVE)" != "\$timestamp" ]; then
       break
     fi
     sleep 1
   done
-  [ "\$(redis-cli -h \$redis_host LASTSAVE)" != "\$timestamp" ] # exits 1 if bgsave didn't work
+  [ "\$(ghe-redis-cli --remote -h \$redis_host LASTSAVE)" != "\$timestamp" ] # exits 1 if bgsave didn't work
 
   if [ "\$redis_host" != "localhost" ]; then
     ssh \$redis_host sudo cat '$GHE_REMOTE_DATA_USER_DIR/redis/dump.rdb'

test/bin/redis-cli renamed to test/bin/ghe-redis-cli

@@ -18,12 +18,12 @@ while true; do
         echo "fake redis data" > "$GHE_REMOTE_DATA_USER_DIR/redis/dump.rdb"
         break
         ;;
-    -h)
-        # Fake accepting hostname argument
-        shift 2
+    --remote)
+        # Fake accepting remote flag argument
+        shift 3
         ;;
     *)
-        echo "unexpected redis-cli command: $1" 1>&2
+        echo "unexpected ghe-redis-cli command: $1" 1>&2
         exit 1
         ;;
   esac