capricorn 2.0.1 → 2.0.2

data/bin/capricornctl

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 
-require File.dirname(File.expand_path(__FILE__))+'/../../minigems'
-
 begin
   require 'capricorn-client'
 rescue LoadError

data/bin/capricornd

@@ -5,27 +5,34 @@ src  = File.expand_path('../../', __FILE__)
 rel  = File.join(src, 'erlang/rel/capricorn')
 etc  = File.join(root, 'etc/capricorn')
 
-if ARGV.size == 1 and ARGV[0] == "install"
-  require 'fileutils'
+if ARGV.size == 1
+  case ARGV[0]
 
-  FileUtils.mkdir_p(File.join(root, "etc/capricorn"),
-                    :verbose => true)
-  FileUtils.mkdir_p(File.join(root, "var/run/capricorn-machine"),
-                    :verbose => true)
-  FileUtils.mkdir_p(File.join(root, "var/run/capricorn-cluster"),
-                    :verbose => true)
-  FileUtils.mkdir_p(File.join(root, "var/log/sasl"),
-                    :verbose => true)
+  when "install"
+    require 'fileutils'
 
-  FileUtils.cp(File.join(rel, 'etc/capricorn/app.config'),
-               File.join(etc, 'app.config'),
-               :verbose => true)
-  FileUtils.cp(File.join(rel, 'etc/capricorn/cluster-vm.args'),
-               File.join(etc, 'cluster-vm.args'),
-               :verbose => true)
-  FileUtils.cp(File.join(rel, 'etc/capricorn/machine-vm.args'),
-               File.join(etc, 'machine-vm.args'),
-               :verbose => true)
+    FileUtils.mkdir_p(File.join(root, "etc/capricorn"),
+                      :verbose => true)
+    FileUtils.mkdir_p(File.join(root, "var/run/capricorn-machine"),
+                      :verbose => true)
+    FileUtils.mkdir_p(File.join(root, "var/run/capricorn-cluster"),
+                      :verbose => true)
+    FileUtils.mkdir_p(File.join(root, "var/log/sasl"),
+                      :verbose => true)
+
+    FileUtils.cp(File.join(rel, 'etc/capricorn/app.config'),
+                 File.join(etc, 'app.config'),
+                 :verbose => true)
+    FileUtils.cp(File.join(rel, 'etc/capricorn/cluster-vm.args'),
+                 File.join(etc, 'cluster-vm.args'),
+                 :verbose => true)
+    FileUtils.cp(File.join(rel, 'etc/capricorn/machine-vm.args'),
+                 File.join(etc, 'machine-vm.args'),
+                 :verbose => true)
+  when "tail"
+    exec("tail", "-n", "0", "-f", File.join(root, "var/log/capricorn.log"))
+
+  end
 else
   exec(File.join(rel, 'bin/capricornd'), root, *ARGV)
 end

data/erlang/lib/capricorn/ebin/capricorn.app

@@ -27,6 +27,7 @@
     cap_external_apps_api,
     cap_external_gems_api,
     cap_external_machines_api,
+    cap_external_runtime_api,
     cap_gem_utils,
     cap_internal_api,
     cap_internal_apps_api,
@@ -34,6 +35,7 @@
     cap_machine,
     cap_machine_apps,
     cap_machine_apps_sup,
+    cap_runtime,
     cap_sup,
     cap_util
   ]},
@@ -51,6 +53,6 @@
     cap_secondary_services,
     cap_sup
   ]},
-  {applications, [kernel, stdlib, sasl, inets, bertio, bertrpc, gcd, emq]},
+  {applications, [kernel, stdlib, sasl, inets, bertio, bertrpc, emq]},
   {mod, {capricorn_app, []}}
 ]}.

data/erlang/lib/capricorn/src/cap_external_api.erl

@@ -31,6 +31,9 @@ init(Services) ->
 
 
 
+handle_call({runtime, F, A, I}, From, State) ->
+  cap_external_runtime_api:handle_call({F, A, I}, From, State);
+
 handle_call({machines, F, A, I}, From, State) ->
   cap_external_machines_api:handle_call({F, A, I}, From, State);
 
@@ -51,6 +54,9 @@ handle_call({M, F, A, I}, From, State) ->
 
 
 
+handle_cast({runtime, F, A, I}, State) ->
+  cap_external_runtime_api:handle_cast({F, A, I}, State);
+
 handle_cast({machines, F, A, I}, State) ->
   cap_external_machines_api:handle_cast({F, A, I}, State);
 

data/erlang/lib/capricorn/src/cap_external_runtime_api.erl

@@ -0,0 +1,49 @@
+-module(cap_external_runtime_api).
+-export([handle_call/3, handle_cast/2]).
+
+
+
+handle_call({nodes,
+            _, _},
+            _From, State) ->
+  Nodes    = [atom_to_list(Node) || Node <- nodes()],
+  Machines = [list_to_atom(Node) || Node <- Nodes, string:substr(Node, 1, 8) == "machine-"],
+  {reply, [node() | Machines], State};
+
+
+
+handle_call({selfupdate, [RawNode], _}, _From, State) ->
+  try
+    Node =
+    case RawNode of
+    RawNode when is_atom(RawNode)   -> RawNode;
+    RawNode when is_list(RawNode)   -> list_to_atom(RawNode);
+    RawNode when is_binary(RawNode) -> list_to_atom(binary_to_list(RawNode))
+    end,
+    {reply, cap_runtime:selfupdate(Node), State}
+  catch
+    throw:T -> {reply, {error, T}, State}
+  end;
+
+
+
+handle_call({reboot, [RawNode], _}, _From, State) ->
+  try
+    Node =
+    case RawNode of
+    RawNode when is_atom(RawNode)   -> RawNode;
+    RawNode when is_list(RawNode)   -> list_to_atom(RawNode);
+    RawNode when is_binary(RawNode) -> list_to_atom(binary_to_list(RawNode))
+    end,
+    {reply, cap_runtime:reboot(Node), State}
+  catch
+    throw:T -> {reply, {error, T}, State}
+  end.
+
+
+
+handle_cast({_, _, _},
+            State) ->
+  {noreply, State}.
+
+

data/erlang/lib/capricorn/src/cap_runtime.erl

@@ -0,0 +1,65 @@
+-module(cap_runtime).
+-include("capricorn.hrl").
+-behaviour(gen_server).
+
+-export([reboot/1, selfupdate/1, start_link/1]).
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]).
+
+
+
+reboot(Node) ->
+  gen_server:call({cap_runtime, Node}, reboot).
+
+
+
+selfupdate(Node) ->
+  gen_server:call({cap_runtime, Node}, selfupdate).
+
+
+
+start_link(NodeType) ->
+  gen_server:start_link({local, cap_runtime}, ?MODULE, NodeType, []).
+
+
+
+init(NodeType) ->
+  {ok, NodeType}.
+
+
+
+handle_call(selfupdate, From, NodeType) ->
+  Install = os:cmd("gem update capricorn"),
+  init:reboot(),
+  gen_server:reply(From, list_to_binary(Install)),
+  {noreply, NodeType};
+
+
+
+handle_call(reboot, From, NodeType) ->
+  ?LOG_DEBUG("rebooting", []),
+  init:reboot(),
+  gen_server:reply(From, ok),
+  {noreply, NodeType}.
+
+
+
+handle_cast(abcdefg, State) ->
+  {noreply, State}.
+
+
+
+handle_info({_, {data, Msg}}, State) ->
+  ?LOG_DEBUG("reboot> ~s", [Msg]),
+  {noreply, State}.
+
+
+
+terminate(_Reason, _State) ->
+  ok.
+
+
+
+code_change(_OldVsn, State, _Extra) ->
+  {ok, State}.
+
+

data/erlang/lib/capricorn/src/cap_sup.erl

@@ -24,9 +24,9 @@
 %% supervisor callback
 -export([init/1]).
 
- 
+
 -define(SERVER, ?MODULE).
- 
+
 %%
 %% Operation & Maintenance API
 %%
@@ -56,14 +56,14 @@ restart_core_server(machine) ->
 
 start_server(NodeType) ->
   LogLevel = cap_config:get(log, level, info),
-  
+
   % announce startup
   io:format("Capricorn (LogLevel=~s, Node=~s, Type=~s) is starting.~n", [
     LogLevel,
     atom_to_list(node()),
     atom_to_list(NodeType)
   ]),
-  
+
   BaseChildSpecs =
   {{one_for_all, 10, 3600},[
     {cap_primary_services,
@@ -79,16 +79,16 @@ start_server(NodeType) ->
       supervisor,
       [cap_sup]}
   ]},
-  
+
   {ok, Pid} = supervisor:start_link({local, cap_sup}, cap_sup, BaseChildSpecs),
-  
+
   io:format("Capricorn has started. Time to relax.~n"),
-  
+
   {ok, Pid}.
 
 start_primary_services(cluster) ->
   ExternalApi = cap_config:get(cluster, api),
-  
+
   supervisor:start_link({local, cap_primary_services}, cap_sup,
   {{one_for_one, 10, 3600},[
     {cap_log,
@@ -120,11 +120,17 @@ start_primary_services(cluster) ->
       permanent,
       1000,
       worker,
-      [cap_external_api]}
+      [cap_external_api]},
+    {cap_runtime,
+      {cap_runtime, start_link, ["cluster"]},
+      permanent,
+      brutal_kill,
+      worker,
+      [cap_runtime]}
   ]});
 start_primary_services(machine) ->
   InternalApi = cap_config:get(machine, api),
-  
+
   supervisor:start_link({local, cap_primary_services}, cap_sup,
   {{one_for_one, 10, 3600},[
     {cap_log,
@@ -162,7 +168,13 @@ start_primary_services(machine) ->
       permanent,
       infinity,
       supervisor,
-      [cap_machine_apps_sup]}
+      [cap_machine_apps_sup]},
+    {cap_runtime,
+      {cap_runtime, start_link, ["machine"]},
+      permanent,
+      brutal_kill,
+      worker,
+      [cap_runtime]}
   ]}).
 
 start_secondary_services(NodeType) ->
@@ -177,7 +189,7 @@ start_secondary_services(NodeType) ->
     end
     || {Name, {Module, Fun, Args}}
     <- cap_config:get(NodeType, daemons, [])],
-  
+
   EventHandlerSpecs = [
     begin
       {Name,
@@ -189,7 +201,7 @@ start_secondary_services(NodeType) ->
     end
     || {Name, {Module, Args}}
     <- cap_config:get(NodeType, event_handlers, [])],
-  
+
   supervisor:start_link({local, cap_secondary_services}, cap_sup,
     {{one_for_one, 10, 3600}, DaemonChildSpecs++EventHandlerSpecs}).
 

data/erlang/rebar.config

@@ -2,7 +2,6 @@
   "lib/bert",
   "lib/bertio",
   "lib/bertrpc",
-  "lib/gcd",
   "lib/emq",
   "lib/capricorn",
   "rel"

data/erlang/rel/overlay/etc/capricorn/cluster-vm.args

@@ -7,7 +7,7 @@
 
 ## Heartbeat management; auto-restarts VM if it dies or becomes unresponsive
 ## (Disabled by default..use with caution!)
-##-heart
+-heart
 
 ## Enable kernel poll and a few async threads
 +K true
@@ -16,6 +16,6 @@
 ## Increase number of concurrent ports/sockets
 -env ERL_MAX_PORTS 4096
 
-## Tweak GC to run more often 
+## Tweak GC to run more often
 -env ERL_FULLSWEEP_AFTER 10
 

data/erlang/rel/overlay/etc/capricorn/machine-vm.args

@@ -7,7 +7,7 @@
 
 ## Heartbeat management; auto-restarts VM if it dies or becomes unresponsive
 ## (Disabled by default..use with caution!)
-##-heart
+-heart
 
 ## Enable kernel poll and a few async threads
 +K true
@@ -16,6 +16,6 @@
 ## Increase number of concurrent ports/sockets
 -env ERL_MAX_PORTS 4096
 
-## Tweak GC to run more often 
+## Tweak GC to run more often
 -env ERL_FULLSWEEP_AFTER 10
 

data/erlang/rel/reltool.config

@@ -8,7 +8,6 @@
     bert,
     bertio,
     bertrpc,
-    gcd,
     emq,
     capricorn
   ]},
@@ -26,7 +25,6 @@
   {app, bert,      [{incl_cond, include}]},
   {app, bertio,    [{incl_cond, include}]},
   {app, bertrpc,   [{incl_cond, include}]},
-  {app, gcd,       [{incl_cond, include}]},
   {app, emq,       [{incl_cond, include}]},
   {app, capricorn, [{incl_cond, include}]},
   {app, sasl,      [{incl_cond, include}]}
@@ -38,6 +36,6 @@
     "var/run/capricorn-cluster",
     "var/log/sasl"
   ]},
-  
+
   {overlay, "overlay"}
 ]}.

data/lib/capricorn-client.rb

@@ -4,29 +4,29 @@ module Capricorn
   require 'bertrpc'
   require 'highline'
   require 'fileutils'
-  
+
   require 'capricorn-client/helpers'
-  
+
   module CLI
     require 'capricorn-client/cli/applications'
     require 'capricorn-client/cli/gems'
     require 'capricorn-client/cli/machines'
   end
-  
+
   module Runner
-    
+
     HELP = <<-EOH
 Topics:
   CLUSTER applications
   # manage applications
-   
+
   CLUSTER gems
   # manage gems
-   
+
   CLUSTER machines
   # manage machines
 EOH
-    
+
     DEFAULT_CONFIG = <<-EOH
 cluster_name:
   host: localhost
@@ -34,20 +34,20 @@ cluster_name:
   username: dummy
   password: dummy
 EOH
-    
+
     def start
       cluster_name = ARGV.shift
       unless cluster_name
         help
         exit 1
       end
-      
+
       @cluster = config[cluster_name]
       unless @cluster
         puts "I don't know this cluster"
         exit 1
       end
-      
+
       case ARGV.shift
       when 'applications'
         Capricorn::CLI::Applications.start
@@ -59,15 +59,15 @@ EOH
         help
       end
     end
-    
+
     def help
       puts HELP
     end
-    
+
     def cluster
       @cluster
     end
-    
+
     def config
       @config ||= begin
         config_path = File.expand_path('~/.capricorn/config.yml')
@@ -80,7 +80,7 @@ EOH
         YAML.load_file(config_path)
       end
     end
-    
+
     extend self
   end
 end

data/lib/capricorn-client/cli/machines.rb

@@ -1,9 +1,21 @@
 class Capricorn::CLI::Machines < Thor
   include Capricorn::Helpers
-  
+
   desc "list", "list all machines"
   def list
     ui.table("Machines", self.machines)
   end
-  
+
+  desc "reboot [NODE]", "reboot a node"
+  def reboot(node=nil)
+    node ||= select_node
+    puts client.call.runtime.reboot(node.to_sym)
+  end
+
+  desc "selfupdate [NODE]", "update a node"
+  def selfupdate(node=nil)
+    node ||= select_node
+    puts client.call.runtime.selfupdate(node.to_sym)
+  end
+
 end

data/lib/capricorn-client/helpers.rb

@@ -1,5 +1,5 @@
 module Capricorn::Helpers
-  
+
   def select_machine
     if self.machines.size > 1
       ui.choose(*self.machines)
@@ -10,16 +10,27 @@ module Capricorn::Helpers
       exit(1)
     end
   end
-  
+
+  def select_node
+    if self.nodes.size > 1
+      ui.choose(*self.nodes)
+    elsif self.nodes.size == 1 and ui.agree("Use nodes #{self.nodes.first}? ")
+      self.nodes.first
+    else
+      puts ui.color('No nodes found!!!', :red)
+      exit(1)
+    end
+  end
+
   def select_application
     machine = select_machine
-    
+
     apps = client.call.applications.all(machine.to_sym).last || []
     apps.collect! do |app|
       app[1]
     end
     apps.flatten!
-    
+
     if apps.size > 1
       [machine, ui.choose(*apps)]
     elsif apps.size == 1 and ui.agree("Use application #{apps.first}? ")
@@ -29,20 +40,26 @@ module Capricorn::Helpers
       exit(1)
     end
   end
-  
+
   def machines
     @machines ||= (client.call.machines.all || []).collect do |machine|
       machine.to_s
     end
   end
-  
+
+  def nodes
+    @nodes ||= (client.call.runtime.nodes || []).collect do |node|
+      node.to_s
+    end
+  end
+
   def client
     cluster = Capricorn::Runner.cluster
     host    = (cluster['host'] || 'localhost').to_s
     port    = (cluster['port'] || 3457).to_i
     @client ||= BERTRPC::Service.new(host, port)
   end
-  
+
   def ui
     @ui ||= begin
       @ui = HighLine.new
@@ -50,13 +67,13 @@ module Capricorn::Helpers
       @ui
     end
   end
-  
+
   module UI
-    
+
     def table(headers, items, mode=:rows, option=nil)
       headers = [headers].flatten.collect { |h| color(h, :green) }
       @output.puts list(headers+items, mode, option)
     end
-    
+
   end
 end

data/lib/capricorn/version.rb

@@ -1,5 +1,5 @@
 module Capricorn
 
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capricorn
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 2
   - 0
-  - 1
-  version: 2.0.1
+  - 2
+  version: 2.0.2
 platform: ruby
 authors: 
 - Simon Menke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-01 00:00:00 +02:00
+date: 2010-06-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 25
         segments: 
         - 1
         - 3
-        - 0
-        version: 1.3.0
+        - 1
+        version: 1.3.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -169,6 +169,7 @@ files:
 - erlang/lib/capricorn/src/cap_external_apps_api.erl
 - erlang/lib/capricorn/src/cap_external_gems_api.erl
 - erlang/lib/capricorn/src/cap_external_machines_api.erl
+- erlang/lib/capricorn/src/cap_external_runtime_api.erl
 - erlang/lib/capricorn/src/cap_gem_utils.erl
 - erlang/lib/capricorn/src/cap_internal_api.erl
 - erlang/lib/capricorn/src/cap_internal_apps_api.erl
@@ -176,6 +177,7 @@ files:
 - erlang/lib/capricorn/src/cap_machine.erl
 - erlang/lib/capricorn/src/cap_machine_apps.erl
 - erlang/lib/capricorn/src/cap_machine_apps_sup.erl
+- erlang/lib/capricorn/src/cap_runtime.erl
 - erlang/lib/capricorn/src/cap_sup.erl
 - erlang/lib/capricorn/src/cap_util.erl
 - erlang/lib/capricorn/src/capricorn.erl
@@ -187,15 +189,6 @@ files:
 - erlang/lib/emq/src/emq_queue.erl
 - erlang/lib/emq/src/emq_status.erl
 - erlang/lib/emq/src/emq_sup.erl
-- erlang/lib/gcd/ebin/gcd.app
-- erlang/lib/gcd/include/gcd.hrl
-- erlang/lib/gcd/rebar.config
-- erlang/lib/gcd/src/gcd.erl
-- erlang/lib/gcd/src/gcd_app.erl
-- erlang/lib/gcd/src/gcd_event.erl
-- erlang/lib/gcd/src/gcd_server.erl
-- erlang/lib/gcd/src/gcd_srv.erl
-- erlang/lib/gcd/src/gcd_sup.erl
 - erlang/rebar
 - erlang/rebar.config
 - erlang/rel/overlay/bin/capricornd

data/erlang/lib/gcd/ebin/gcd.app

@@ -1,18 +0,0 @@
-{application, gcd, [
-  {description, "Grand Central Dispatch"},
-  {vsn, "0.1"},
-  {modules, [
-    gcd_app,
-    gcd_sup,
-    gcd_srv,
-    gcd_event,
-    gcd_server,
-    gcd
-  ]},
-  {registered, [
-    gcd_srv,
-    gcd_sup
-  ]},
-  {applications, [kernel, stdlib]},
-  {mod, {gcd_app, []}}
-]}.

data/erlang/lib/gcd/include/gcd.hrl

@@ -1,5 +0,0 @@
-
--record(state,    {local,remote,nodes,monitors}).
--record(service,  {pid,node,location,name,description}).
--record(node,     {name}).
--record(monitor,  {ref,pid,pattern}).

data/erlang/lib/gcd/rebar.config

@@ -1,3 +0,0 @@
-{cover_enabled, true}.
-{erl_opts, [debug_info, fail_on_warning, {i, ".."}]}.
-{lib_dirs, [".."]}.

data/erlang/lib/gcd/src/gcd.erl

@@ -1,51 +0,0 @@
--module(gcd).
--include("gcd.hrl").
-
--export([start/0, stop/0]).
-
--export([connect/1]).
--export([register/2, unregister/0]).
--export([monitor/1, demonitor/1]).
--export([match_object/1, foldl/2]).
-
-
-%%% Application API
-start() ->
-  application:start(gcd).
-
-stop() ->
-  application:stop(gcd).
-
-
-%%% External API
-connect(Node) when is_atom(Node) -> 
-  connect([Node]);
-connect([]) -> ok;
-connect([Node|Rest]) ->
-  net_adm:ping(Node),
-  connect(Rest).
-
-register(Name, Description) ->
-  Info = erlang:process_info(self()),
-  RegisteredName = proplists:get_value(registered_name, Info),
-  Location =
-  case RegisteredName of
-  undefined -> self();
-  _Else     -> {RegisteredName, node()}
-  end,
-  gen_server:call(gcd_srv, {register, self(), Name, node(), Location, Description}).
-
-unregister() ->
-  gen_server:call(gcd_srv, {unregister, self()}).
-
-monitor(Pattern) ->
-  gen_server:call(gcd_srv, {monitor, self(), Pattern}).
-
-demonitor(Ref) ->
-  gen_server:call(gcd_srv, {demonitor, Ref}).
-
-foldl(Fun, Acc) ->
-  gen_server:call(gcd_srv, {foldl, Fun, Acc}).
-
-match_object(Pattern) ->
-  gen_server:call(gcd_srv, {match_object, Pattern}).

data/erlang/lib/gcd/src/gcd_app.erl

@@ -1,13 +0,0 @@
--module(gcd_app).
--behaviour(application).
-
--export([start/2, stop/1]).
-
-start(_StartType, _StartArgs) ->
-  case gcd_sup:start_link() of
-  {ok, Pid} -> {ok, Pid};
-  Error     -> Error
-  end.
-
-stop(_State) ->
-  ok.

data/erlang/lib/gcd/src/gcd_event.erl

@@ -1,39 +0,0 @@
--module(gcd_event).
--include("gcd.hrl").
-
-
--export([notify/2, sync_notify/2]).
--export([call/3, call/4]).
-
-
-notify(Pattern, Message) ->
-  [begin
-    #service{location=Location} = Service,
-    gen_event:notify(Location, Message)
-  end ||
-  Service <- gcd:match_object(Pattern)].
-
-
-sync_notify(Pattern, Message) ->
-  [begin
-    #service{location=Location} = Service,
-    gen_event:sync_notify(Location, Message)
-  end ||
-  Service <- gcd:match_object(Pattern)].
-
-
-call(Pattern, Handler, Message) ->
-  [begin
-    #service{location=Location} = Service,
-    gen_event:call(Location, Handler, Message)
-  end ||
-  Service <- gcd:match_object(Pattern)].
-
-
-call(Pattern, Handler, Message, Timeout) ->
-  [begin
-    #service{location=Location} = Service,
-    gen_event:call(Location, Handler, Message, Timeout)
-  end ||
-  Service <- gcd:match_object(Pattern)].
-

data/erlang/lib/gcd/src/gcd_server.erl

@@ -1,30 +0,0 @@
--module(gcd_server).
--include("gcd.hrl").
-
-
--export([cast/2]).
--export([call/2, call/3]).
-
-
-call(Pattern, Message) ->
-  [begin
-    #service{location=Location} = Service,
-    gen_server:call(Location, Message)
-  end ||
-  Service <- gcd:match_object(Pattern)].
-
-
-call(Pattern, Message, Timeout) ->
-  [begin
-    #service{location=Location} = Service,
-    gen_server:call(Location, Message, Timeout)
-  end ||
-  Service <- gcd:match_object(Pattern)].
-
-
-cast(Pattern, Message) ->
-  [begin
-    #service{location=Location} = Service,
-    gen_server:cast(Location, Message)
-  end ||
-  Service <- gcd:match_object(Pattern)].

data/erlang/lib/gcd/src/gcd_srv.erl

@@ -1,186 +0,0 @@
--module(gcd_srv).
--behaviour(gen_server).
--include("gcd.hrl").
-
--export([start_link/0]).
--export([init/1, handle_call/3, handle_cast/2,
-         handle_info/2, terminate/2, code_change/3]).
-
--define(L(State), State#state.local).
--define(R(State), State#state.remote).
--define(N(State), State#state.nodes).
--define(M(State), State#state.monitors).
-
-
-%%% Start the server
-start_link() ->
-  gen_server:start_link({local, gcd_srv}, ?MODULE, [], []).
-
-
-%%% Initialize the server
-init([]) ->
-  net_kernel:monitor_nodes(true),
-  Local    = ets:new(gcd_srv_local,    [set,private,{keypos,2}]),
-  Remote   = ets:new(gcd_srv_remote,   [set,private,{keypos,4}]),
-  Nodes    = ets:new(gcd_srv_nodes,    [set,private,{keypos,2}]),
-  Monitors = ets:new(gcd_srv_monitors, [set,private,{keypos,2}]),
-  {ok, #state{local=Local,remote=Remote,nodes=Nodes,monitors=Monitors}}.
-
-
-%%% Handle call messages
-handle_call({foldl, Fun, Acc1}, _From, State) ->
-  Acc2 = ets:foldl(Fun, Acc1, ?L(State)),
-  Acc3 = ets:foldl(Fun, Acc2, ?R(State)),
-  {reply, Acc3, State};
-
-handle_call({match_object, Pattern}, _From, State) ->
-  Services1 = ets:match_object(?L(State), Pattern),
-  Services2 = ets:match_object(?R(State), Pattern),
-  {reply, Services1 ++ Services2, State};
-
-handle_call({register, Pid, Name, Node, Location, Description}, _From, State) ->
-  Service = #service{node=Node, location=Location, pid=Pid, name=Name, description=Description},
-  case ets:insert_new(?L(State), Service) of
-  true ->
-    erlang:monitor(process, Pid),
-    gen_server:cast(self(), {serviceup, Service}),
-    {reply, ok, State};
-  false ->
-    {reply, {error, already_registerd}, State}
-  end;
-
-handle_call({unregister, Pid}, _From, State) ->
-  case ets:lookup(?L(State), Pid) of
-  [Service] ->
-    gen_server:cast(self(), {servicedown, Service}),
-    ets:delete(?L(State), Pid);
-  _ -> ok
-  end,
-  {reply, ok, State};
-
-handle_call({monitor, Pid, Pattern}, _From, State) ->
-  Monitor = #monitor{ref=erlang:make_ref(), pid=Pid, pattern=Pattern},
-  case ets:insert_new(?M(State), Monitor) of
-  true ->
-    erlang:monitor(process, Pid),
-    {reply, Monitor#monitor.ref, State};
-  false ->
-    {reply, {error, already_registerd}, State}
-  end;
-
-handle_call({demonitor, Ref}, _From, State) ->
-  ets:delete(?M(State), Ref),
-  {reply, ok, State};
-
-handle_call(_Request, _From, State) ->
-  {reply, ok, State}.
-
-
-%%% Handle cast messages
-handle_cast({info, Node, Nodes, Services}, State) ->
-  ets:insert(?N(State), #node{name=Node}),
-  ets:insert(?R(State), Services),
-  [net_adm:ping(Node1) || Node1 <- Nodes],
-  [gen_server:cast(self(), {serviceup, Service}) || Service <- Services],
-  {noreply, State};
-
-handle_cast({serviceup, Service}, State) ->
-  case Service#service.pid of
-  remote ->
-    ets:insert(?R(State), Service);
-  _Pid   -> 
-    ets:insert(?L(State), Service),
-    ets:foldl(fun(#node{name=Node}, _) ->
-      gen_server:cast({gcd_srv, Node}, {serviceup, Service#service{pid=remote}})
-    end, [], ?N(State))
-  end,
-  
-  ets:foldl(fun(#monitor{pattern=Pattern,pid=Pid,ref=Ref}, _) ->
-    case ets:test_ms(Service, [{Pattern,[],[true]}]) of
-    {ok, true} ->
-      Pid ! {serviceup, Ref, Service};
-    _Else -> ignore
-    end
-  end, [], ?M(State)),
-  
-  {noreply, State};
-
-handle_cast({servicedown, Service}, State) ->
-  case Service#service.pid of
-  remote ->
-    ets:delete(?R(State), Service#service.location);
-  _Pid   ->
-    ets:delete(?L(State), Service#service.pid),
-    ets:foldl(fun(#node{name=Node}, _) ->
-      gen_server:cast({gcd_srv, Node}, {servicedown, Service#service{pid=remote}})
-    end, [], ?N(State))
-  end,
-  
-  ets:foldl(fun(#monitor{pattern=Pattern,pid=Pid,ref=Ref}, _) ->
-    case ets:test_ms(Service, [{Pattern,[],[true]}]) of
-    {ok, true} ->
-      Pid ! {servicedown, Ref, Service};
-    _Else -> ignore
-    end
-  end, [], ?M(State)),
-  
-  {noreply, State};
-
-handle_cast(stop, State) ->
-  {stop, normal, State};
-
-handle_cast(_Msg, State) ->
-  {noreply, State}.
-
-
-%%% Handle generic messages
-handle_info({'DOWN', _Ref, process, Pid, _Reason}, State) ->
-  case ets:lookup(?L(State), Pid) of
-  [Service] ->
-    gen_server:cast(self(), {servicedown, Service}),
-    ets:delete(?L(State), Pid);
-  _ -> ok
-  end,
-  Monitors = ets:foldl(fun
-  (#monitor{ref=Ref,pid=Pid1}, Acc) when Pid1 == Pid ->
-    [Ref|Acc];
-  (_Else, Acc) -> Acc
-  end, [], ?M(State)),
-  [ets:delete(?M(State), Ref) || Ref <- Monitors],
-  {noreply, State};
-
-handle_info({nodeup, Node}, State) ->
-  gen_server:cast({gcd_srv, Node}, {info, node(),
-    ets:foldl(fun(#node{name=N}, Acc) -> [N|Acc]                     end, [], ?N(State)),
-    ets:foldl(fun(#service{}=S, Acc)  -> [S#service{pid=remote}|Acc] end, [], ?L(State))
-  }),
-  
-  {noreply, State};
-
-handle_info({nodedown, Node}, State) ->
-  ets:delete(?N(State), Node),
-  
-  Keys = ets:foldl(fun
-  (#service{node=Node1,location=L}=Service, Acc) when Node1 == Node->
-    gen_server:cast(self(), {servicedown, Service}),
-    [L|Acc];
-  (_Else, Acc) -> Acc
-  end, [], ?R(State)),
-  [ets:delete(?R(State), Key) || Key <- Keys],
-  
-  {noreply, State};
-
-handle_info(_Info, State) ->
-  {noreply, State}.
-
-%%% Before stopping the server
-terminate(_Reason, State) ->
-  ets:delete(?L(State)),
-  ets:delete(?R(State)),
-  ets:delete(?N(State)),
-  ets:delete(?M(State)),
-  ok.
-
-%%% Code Changes
-code_change(_OldVsn, State, _Extra) ->
-  {ok, State}.

data/erlang/lib/gcd/src/gcd_sup.erl

@@ -1,18 +0,0 @@
--module(gcd_sup).
--behaviour(supervisor).
-
--export([start_link/0]).
--export([init/1]).
-
-start_link() ->
-  supervisor:start_link({local, gcd_sup}, ?MODULE, []).
-
-init([]) ->
-  {ok, {{one_for_one, 10, 3600},[
-    {gcd_srv,
-      {gcd_srv, start_link, []},
-      permanent,
-      brutal_kill,
-      worker,
-      [gcd_srv]}
-  ]}}.