Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Karl-Aksel Puulmann committed Feb 10, 2017
1 parent a842024 commit 3add0f6
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 6 deletions.
4 changes: 2 additions & 2 deletions lib/pagerbot.rb
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def to_boolean(s)

SemanticLogger.add_appender(io: STDERR, formatter: :color)

PagerBot.log.info("Starting application", is_admin: is_admin, argv: ARGV)
PagerBot.log.info("Starting application", is_admin: is_admin, adapter: congigatron.bot.adapter, argv: ARGV)
if is_admin
PagerBot::AdminPage.run!
else
Expand All @@ -110,7 +110,7 @@ def to_boolean(s)
PagerBot::IrcAdapter.run!
else
desiredAdapter = ARGV.first || configatron.bot.adapter
puts("Could not find adapter #{desiredAdapter}.\n" \
PagerBot.log.error("Could not find adapter #{desiredAdapter}.\n" \
"It must be one of 'irc', 'slack', 'slack-rtm' or 'hipchat'.\n\n" \
"To configure the bot, run this command again with `admin` as the first argument.")
exit 1
Expand Down
1 change: 0 additions & 1 deletion lib/pagerbot/plugin/add_alias.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ def parse(query)
result = {
field_value: [],
new_alias: [],

}

query[:words].each do |word|
Expand Down
2 changes: 1 addition & 1 deletion lib/pagerbot/plugin/plugin_base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,4 @@ def self.included(by)
by.extend ClassMethods
end
end
end
end
3 changes: 1 addition & 2 deletions test/unit/pagerbot/plugins/call.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ def parse(text, pm, botname="test-pagerbot")
PagerBot::Parsing.parse(botname+": "+text, botname, pm)
end

before do
before do
@config = {
call: {
keyword: '911',
Expand All @@ -24,7 +24,6 @@ def parse(text, pm, botname="test-pagerbot")

am = PagerBot.action_manager({:pagerduty => @pagerduty_settings, :bot => {:name => "pagerbot"}})
am.stubs(:plugin_manager).returns(@plugin_manager)

end

describe "call plugin" do
Expand Down

0 comments on commit 3add0f6

Please sign in to comment.