From 533e695d55fc98732a12ddbcf371fadc02dc8ca1 Mon Sep 17 00:00:00 2001
From: Neil Williams <neil@reddit.com>
Date: Thu, 31 May 2012 13:47:16 -0700
Subject: [PATCH] Tweak wrap-job to support queue consumer naming conventions.

---
 scripts/wrap-job | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/scripts/wrap-job b/scripts/wrap-job
index d881530dd..32c91177c 100755
--- a/scripts/wrap-job
+++ b/scripts/wrap-job
@@ -32,6 +32,9 @@ import syslog
 import subprocess
 
 
+CONSUMER_PREFIX = "reddit-consumer-"
+
+
 # drop permissions
 user = os.environ.get("REDDIT_USER", "reddit")
 group = os.environ.get("REDDIT_GROUP", user)
@@ -48,6 +51,13 @@ os.chdir(r2_root)
 
 # configure syslog
 job_name = os.environ.get("UPSTART_JOB", "-".join(sys.argv[1:]))
+if job_name.startswith(CONSUMER_PREFIX):
+    # consumers are a bit different from crons, while crons want an
+    # ident of reddit-job-JOBNAME, we want consumers to have an ident
+    # of CONSUMERNAME_INSTANCE
+    job_name = (job_name[len(CONSUMER_PREFIX):] +
+                "_" +
+                os.environ.get("UPSTART_INSTANCE", ""))
 facility = getattr(syslog, "LOG_" + os.environ.get("REDDIT_LOG_FACILITY", "CRON"))
 syslog.openlog(ident=job_name, facility=facility)