log_event: Use 'with' for files

(imported from commit d49b46ecd8aa74679ade3820004d10cb42940ad3)
This commit is contained in:
Keegan McAllister
2012-11-14 10:43:32 -05:00
parent ccf14b89c2
commit af36b437b6

View File

@@ -474,14 +474,14 @@ def get_user_profile_by_id(uid):
def log_event(event): def log_event(event):
assert("timestamp" in event) assert("timestamp" in event)
if not os.path.exists(settings.MESSAGE_LOG + '.lock'): if not os.path.exists(settings.MESSAGE_LOG + '.lock'):
file(settings.MESSAGE_LOG + '.lock', "w").write("0") with open(settings.MESSAGE_LOG + '.lock', 'w') as lock:
lock = open(settings.MESSAGE_LOG + '.lock', 'r') lock.write('0')
fcntl.flock(lock, fcntl.LOCK_EX)
f = open(settings.MESSAGE_LOG, "a") with open(settings.MESSAGE_LOG + '.lock', 'r') as lock:
f.write(simplejson.dumps(event) + "\n") fcntl.flock(lock, fcntl.LOCK_EX)
f.close() with open(settings.MESSAGE_LOG, 'a') as log:
fcntl.flock(lock, fcntl.LOCK_UN) log.write(simplejson.dumps(event) + '\n')
lock.close() fcntl.flock(lock, fcntl.LOCK_UN)
def log_message(message): def log_message(message):
if not message.sending_client.name.startswith("test:"): if not message.sending_client.name.startswith("test:"):