0
@@ -51,33 +51,31 @@ start_handler(Owner) ->
0
       exit(Reason)
0
   end.
0
 
0
-% Send an alert via the beanstalk -> XMPP gateway
0
-gen_alert_xmpp(Subject, Msg) ->
0
+with_beanstalk(Tube, F) ->
0
   BeanstalkServer = environ_utilities:get_env(beanstalk_server, "localhost"),
0
   BeanstalkPort = environ_utilities:get_env(beanstalk_server, 11300),
0
   {ok, Socket} = beanstalk:connect(BeanstalkServer, BeanstalkPort),
0
-	{using, "environ"} = beanstalk:use(
0
-		environ_utilities:get_env(beanstalk_tube, "westspyxmpp"), Socket),
0
-	% Flattening the list because it came from formats...
0
-	Recips = environ_utilities:get_env(xmpp_notifications, []),
0
-	lists:foreach(fun (To) ->
0
-		{inserted, _JobID} = beanstalk:put(
0
-			beanstalk_job:new(lists:flatten(
0
-				To ++ " " ++ Subject ++ "\n" ++ Msg)), Socket)
0
-			end, Recips),
0
+	{using, Tube} = beanstalk:use(Tube, Socket),
0
+	F(Socket),
0
   ok = gen_tcp:close(Socket).
0
 
0
+% Send an alert via the beanstalk -> XMPP gateway
0
+gen_alert_xmpp(Subject, Msg) ->
0
+	with_beanstalk("westspyxmpp", fun(Socket) ->
0
+		% Flattening the list because it came from formats...
0
+		lists:foreach(fun (To) ->
0
+			{inserted, _JobID} = beanstalk:put(
0
+				beanstalk_job:new(lists:flatten(
0
+					To ++ " " ++ Subject ++ "\n" ++ Msg)), Socket)
0
+			end, environ_utilities:get_env(xmpp_notifications, []))
0
+		end).
0
+
0
 % XXX:  This will likely go away when twitter's xmpp bot is back.
0
 gen_alert_twitter(Subject, Msg) ->
0
-	BeanstalkServer = environ_utilities:get_env(beanstalk_server, "localhost"),
0
-	BeanstalkPort = environ_utilities:get_env(beanstalk_server, 11300),
0
-	{ok, Socket} = beanstalk:connect(BeanstalkServer, BeanstalkPort),
0
-	{using, "environ"} = beanstalk:use(
0
-		environ_utilities:get_env(beanstalk_tube, "environ"), Socket),
0
-	% Flattening the list because it came from formats...
0
-	{inserted, _JobID} = beanstalk:put(
0
-		beanstalk_job:new(lists:flatten(Subject ++ "\n" ++ Msg)), Socket),
0
-	ok = gen_tcp:close(Socket).
0
+	with_beanstalk("environ", fun(Socket) ->
0
+		{inserted, _JobID} = beanstalk:put(
0
+			beanstalk_job:new(lists:flatten(Subject ++ "\n" ++ Msg)), Socket)
0
+		end).
0
 
0
 % Generic alert send function
0
 gen_alert(Recips, Subject, Msg) ->