From ff41fd284fc4b2c376bbd26fa4a2101c9ea45c43 Mon Sep 17 00:00:00 2001
From: Anthony Eden <me@anthonyeden.com>
Date: Mon, 2 Mar 2015 12:54:56 +0100
Subject: [PATCH] Small refactoring.

---
 src/erldns_config.erl | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/erldns_config.erl b/src/erldns_config.erl
index c7922128..4f9138df 100644
--- a/src/erldns_config.erl
+++ b/src/erldns_config.erl
@@ -164,12 +164,9 @@ keyget(Key, Data, Default) ->
       Value
   end.
 
-% Private functions
 
-parse_address(Address) when is_list(Address) ->
-  {ok, Tuple} = inet_parse:address(Address),
-  Tuple;
-parse_address(Address) -> Address.
+%% Zone server configuration
+%% TODO: remove as zone server client logic has been removed
 
 zone_server_env() ->
   {ok, ZoneServerEnv} = application:get_env(erldns, zone_server),
@@ -205,6 +202,9 @@ websocket_path() ->
 websocket_url() ->
   atom_to_list(websocket_protocol()) ++ "://" ++ websocket_host() ++ ":" ++ integer_to_list(websocket_port()) ++ websocket_path().
 
+
+%% Storage configuration
+
 storage_type() ->
   storage_get(type).
 
@@ -226,6 +226,24 @@ storage_port() ->
 storage_env() ->
   get_env(storage).
 
+storage_get(Key) ->
+  get_env_value(Key, storage).
+
+% Private functions
+
+parse_address(Address) when is_list(Address) ->
+  {ok, Tuple} = inet_parse:address(Address),
+  Tuple;
+parse_address(Address) -> Address.
+
+get_env_value(Key, Name) ->
+  case lists:keyfind(Key, 1, get_env(Name)) of
+    false ->
+      undefined;
+    {Key, Value} ->
+      Value
+  end.
+
 get_env(storage) ->
   case application:get_env(erldns, storage) of
     undefined ->
@@ -238,11 +256,3 @@ get_env(storage) ->
     {ok, Env} ->
       Env
   end.
-
-storage_get(Key) ->
-  case lists:keyfind(Key, 1, get_env(storage)) of
-    false ->
-      undefined;
-    {Key, Value} ->
-      Value
-  end.