Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Code cleanup #1

Merged
merged 5 commits into from
May 27, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
erl_crash.dump
*.ez
config/system.exs
/doc
/doc
overseer.sublime-workspace
6 changes: 3 additions & 3 deletions lib/overseer/modules/listener.ex
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ defmodule OpenAperture.Overseer.Modules.Listener do
alias OpenAperture.Messaging.AMQP.QueueBuilder
alias OpenAperture.Messaging.AMQP.SubscriptionHandler

alias OpenAperture.Overseer.MessageManager
#alias OpenAperture.Overseer.MessageManager
alias OpenAperture.Overseer.Configuration

alias OpenAperture.ManagerApi
Expand Down Expand Up @@ -54,11 +54,11 @@ defmodule OpenAperture.Overseer.Modules.Listener do
event_queue = QueueBuilder.build(ManagerApi.get_api, Configuration.get_current_system_modules_queue_name, Configuration.get_current_exchange_id)

options = OpenAperture.Messaging.ConnectionOptionsResolver.get_for_broker(ManagerApi.get_api, Configuration.get_current_broker_id)
subscription_handler = case subscribe(options, event_queue, fn(payload, _meta, %{subscription_handler: subscription_handler, delivery_tag: delivery_tag} = async_info) ->
subscription_handler = case subscribe(options, event_queue, fn(payload, _meta, %{subscription_handler: subscription_handler, delivery_tag: delivery_tag} = _async_info) ->
#Logger.debug("[Listener] Received message #{delivery_tag}")
#MessageManager.track(async_info)
process_event(payload, delivery_tag)
OpenAperture.Messaging.AMQP.SubscriptionHandler.acknowledge(subscription_handler, delivery_tag)
SubscriptionHandler.acknowledge(subscription_handler, delivery_tag)
#MessageManager.remove(delivery_tag)
end) do
{:ok, subscription_handler} ->
Expand Down
4 changes: 2 additions & 2 deletions mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ defmodule OpenAperture.Overseer.Mixfile do
# Type `mix help deps` for more examples and options
defp deps do
[
{:ex_doc, github: "elixir-lang/ex_doc", only: [:test]},
{:markdown, github: "devinus/markdown", only: [:test]},
{:ex_doc, "0.7.3", only: :test},
{:earmark, "0.1.17", only: :test},

{:poison, "~> 1.3.1"},
{:timex, "~> 0.13.3"},
Expand Down
3 changes: 2 additions & 1 deletion mix.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
%{"amqp": {:hex, :amqp, "0.1.1"},
"amqp_client": {:hex, :amqp_client, "3.5.0"},
"ex_doc": {:git, "git://github.com/elixir-lang/ex_doc.git", "05d578569be0ef2d9231c881232ca53253bab7ca", []},
"earmark": {:hex, :earmark, "0.1.17"},
"ex_doc": {:hex, :ex_doc, "0.7.3"},
"exactor": {:hex, :exactor, "2.1.2"},
"exjsx": {:hex, :exjsx, "3.1.0"},
"exvcr": {:git, "git://github.com/parroty/exvcr.git", "8ca24fcb0af3a26d16c848466977532633575f77", []},
Expand Down
18 changes: 18 additions & 0 deletions overseer.sublime-project
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"folders":
[
{
"follow_symlinks": true,
"path": "."
}
],
"SublimeLinter": {
"linters": {
"elixirc": {
"pa": [
"${project}/_build/dev/lib/overseer/ebin",
]
}
}
}
}