Skip to content

PYTHON3: Run python 2to3 on beatcop.py #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
keithhackbarth wants to merge 1 commit into
base: master
Choose a base branch
from
Open

PYTHON3: Run python 2to3 on beatcop.py #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions beatcop.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"""

import atexit
import ConfigParser
import configparser
import logging
import os
import redis
Expand All @@ -18,6 +18,7 @@
import subprocess
import sys
import time
from functools import reduce

try:
import rediscluster
Expand Down Expand Up @@ -126,7 +127,7 @@ def __init__(self, command, redis_host_or_startup_nodes, redis_port=6379, redis_
log.error("Couldn't connect to Redis: %s", e.message)
sys.exit(os.EX_NOHOST)
# Check Redis version. The 'redis_version' key is absent in Redis Cluster, because redis_info is a dict of cluster nodes instead. In which case our Redis is definitely new enough.
if 'redis_version' in redis_info and reduce(lambda l,r: l*1000+r, map(int,redis_info['redis_version'].split('.'))) < 2006012:
if 'redis_version' in redis_info and reduce(lambda l,r: l*1000+r, list(map(int,redis_info['redis_version'].split('.')))) < 2006012:
log.error("Redis too old. You got %s, minimum requirement is %s", redis_info['redis_version'], '2.6.12')
sys.exit(os.EX_PROTOCOL)
self.lockname = lockname or ("beatcop:%s" % (self.command))
Expand Down Expand Up @@ -211,14 +212,14 @@ def crash(self):

if __name__ == '__main__':
if len(sys.argv) != 2:
print "Usage: %s <ini_file>" % sys.argv[0]
print("Usage: %s <ini_file>" % sys.argv[0])
sys.exit(os.EX_USAGE)
config_file = sys.argv[1]

logging.basicConfig(level=logging.INFO, format='%(asctime)s BeatCop: %(message)s', datefmt='%Y-%m-%d %H:%M:%S %Z')
log = logging.getLogger()

conf = ConfigParser.SafeConfigParser()
conf = configparser.SafeConfigParser()
conf.read(config_file)
sections = conf.sections()

Expand Down