rabbitmq2.4 and now riak is the default db

icecreamboyy · Apr 8, 2011 · 1bd6160 · 1bd6160
1 parent 0088ec8
commit 1bd6160
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/src/ebot.app b/src/ebot.app
@@ -44,8 +44,8 @@
 	 %% Remember also to set DB_BACKEND_MODULE in src/ebot.hrl
 
 	 {db_hostname, "127.0.0.1"},
-	 {db_port, 5984}, %% CouchDB
-	 %% {db_port, 8087}, %% Riak
+	 %% {db_port, 5984}, %% CouchDB
+	 {db_port, 8087}, %% Riak
 
 	 %% ---------------------------------------------------------
 	 %% MQ

diff --git a/src/ebot.hrl b/src/ebot.hrl
@@ -24,8 +24,8 @@
 %% -----------------------------------------------------------------------
 %% DB
 %% -----------------------------------------------------------------------
--define(EBOT_DB_BACKEND, ebot_db_backend_couchdb).
-%-define(EBOT_DB_BACKEND, ebot_db_backend_riak_pb).
+%-define(EBOT_DB_BACKEND, ebot_db_backend_couchdb).
+-define(EBOT_DB_BACKEND, ebot_db_backend_riak_pb).
 
 %% -----------------------------------------------------------------------
 %% WEB

diff --git a/src/ebot_html.erl b/src/ebot_html.erl
@@ -240,7 +240,7 @@ analyze_url_body(Url, {_Status, _Headers, Body}) ->
     Tokens = mochiweb_html:tokens(Body),
     spawn(?MODULE, analyze_url_body_plugins, [Url, Tokens]),
     error_logger:info_report({?MODULE, ?LINE, {analyze_body_plugins, Url}}),
-    Links = ebot_html_util:get_links_from_token(Tokens, Url),
+    Links = ebot_html_util:get_links_from_tokens(Tokens, Url),
     analyze_url_body_links(Url, Links),
     ebot_mq:send_url_processed({Url, empty}).
 

diff --git a/src/ebot_html_analyzer_images.erl b/src/ebot_html_analyzer_images.erl
@@ -34,7 +34,9 @@
 %%--------------------------------------------------------------------
 
 add_images_list(Url, Tokens) ->
-    List = ebot_html_util:get_images_from_tokens(Tokens, Url),
+    %% List = ebot_html_util:get_images_from_tokens(Tokens, Url),
+    %% TODO
+    List = [],
     %% Save Image urls to db and add them to the queue of urls to be visited
     %% lists:foreach(fun ebot_db:open_or_create_url/1, List), 
     %% lists:foreach(fun ebot_crawler:add_url/1, List), 

diff --git a/sys.config b/sys.config
@@ -31,9 +31,9 @@
 	 %% in src/ebot.hrl file
 	 {db_hostname, "127.0.0.1"},
 	 %% COUCHDB
-	 {db_port, 5984},
+	 %%{db_port, 5984},
 	 %% RIAK 
-	 %%{db_port, 8087},
+	 {db_port, 8087},
 
 	 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 	 %% MQ