Permalink
Browse files

Removed default channel handler. We're not limiting inbound on contac…

…t anymore, so we need to vet messages going to each respective channel. Essentially I removed default channel handing for contacts.
  • Loading branch information...
1 parent 624745a commit 6e0d0958cc03c4e85a00529d40f6259538b4e895 @rtucker-mozilla rtucker-mozilla committed May 7, 2012
Showing with 5 additions and 2 deletions.
  1. +5 −2 MozillaNagiosStatus.py
View
@@ -554,8 +554,10 @@ def process_line(self, line, is_test=False):
if is_test is False:
if self.is_muted(channel) is False:
self.connection.send_message(channel, write_string)
- else:
+ elif channel:
return channel, write_string
+ else:
+ return None
def write_to_nagios_cmd(self, write_string):
try:
@@ -571,7 +573,8 @@ def get_channel_group(self, channel_group):
try:
return self.channel_groups[channel_group]
except:
- return self.default_channel_group
+ return None
+ #return self.default_channel_group
def parseConf(self, inputFile):

0 comments on commit 6e0d095

Please sign in to comment.