Fix leofs/issues/99

leo-project · Nov 8, 2013 · bad3973 · bad3973
1 parent 5e0cb7a
commit bad3973
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 18 deletions.
diff --git a/rel/leo_gateway/files/app.config b/rel/leo_gateway/files/app.config
@@ -122,7 +122,7 @@
 
                 %% Log appender - [file]
                 {log_appender, [
-                                {file, [{path, "{{platform_log_dir}}/app"}]}
+                                {file, [{path, "{{app_log_dir}}" }
                                ]},
 
                 %% Directory of log output
@@ -147,7 +147,9 @@
                          ]},
  {leo_redundant_manager, [{profile, false},
                           {notify_mf, [leo_manager_api, notify]},
-                          {sync_mf,   [leo_manager_api, synchronize]}
+                          {sync_mf,   [leo_manager_api, synchronize]},
+                          {log_dir_member, "{{ring_log_dir}}" },
+                          {log_dir_ring,   "{{ring_log_dir}}" }
                          ]},
  {leo_statistics, [{profile, false}]}
 ].
diff --git a/rel/leo_gateway/vars.config b/rel/leo_gateway/vars.config
@@ -106,17 +106,24 @@
 
 %% == Directories ==
 %%
-{snmp_conf_dir,  "snmpa_gateway_0"}.
-{snmp_agent_dir, "{{platform_snmp_dir}}/{{snmp_conf_dir}}/LEO-GATEWAY"}.
+{snmp_conf_dir,   "snmpa_gateway_0"}.
+{snmp_agent_dir,  "{{platform_snmp_dir}}/{{snmp_conf_dir}}/LEO-GATEWAY"}.
 
 %% Directory of Mmneisa
-{mnesia_dir,     "{{platform_work_dir}}/mnesia"}.
+{mnesia_dir,      "{{platform_work_dir}}/mnesia"}.
 %% Directory of mq's db-file
-{queue_dir,      "{{platform_work_dir}}/queue"}.
+{queue_dir,       "{{platform_work_dir}}/queue"}.
 %% Directory of log output
-{sasl_log_dir,   "{{platform_log_dir}}/sasl"}.
+{sasl_log_dir,    "{{platform_log_dir}}/sasl"}.
 %% Directory of sasl-log output
-{sasl_error_log, "{{platform_log_dir}}/sasl/sasl-error.log"}.
+{sasl_error_log,  "{{platform_log_dir}}/sasl/sasl-error.log"}.
+
+%% Application log directory
+{app_log_dir,     "{{platform_log_dir}}/app"}.
+%% Directory of ring and cluster-members log directory
+{ring_log_dir,    "{{platform_log_dir}}/ring"}.
+{members_log_dir, "{{platform_log_dir}}/ring"}.
+
 
 %% Log output level
 %%   0: debug

diff --git a/rel/leo_manager/files/app.config b/rel/leo_manager/files/app.config
@@ -84,7 +84,7 @@
                    {log_level,    {{log_level}} },
                    %% Log appender - [file]
                    {log_appender, [
-                                   {file, [{path, "{{platform_log_dir}}/app"}]}
+                                   {file, [{path, "{{app_log_dir}}" }
                                   ]},
 
                    %% == Directories ==
@@ -104,7 +104,9 @@
     {leo_object_storage,    [{profile, false}]},
     {leo_redundant_manager, [{profile, false},
                              {notify_mf, [leo_manager_api, notify]},
-                             {sync_mf,   [leo_manager_api, synchronize]}
+                             {sync_mf,   [leo_manager_api, synchronize]},
+                             {log_dir_member, "{{ring_log_dir}}" },
+                             {log_dir_ring,   "{{ring_log_dir}}" }
                             ]},
     {leo_statistics, [{profile, false}]}
 ].
diff --git a/rel/leo_manager/vars.config b/rel/leo_manager/vars.config
@@ -79,14 +79,18 @@
 
 %% Directory of Mnesia
 {mnesia_dir,     "{{platform_work_dir}}/mnesia"}.
-
 %% Directory of mq's db-file
 {queue_dir,      "{{platform_work_dir}}/queue"}.
-
 %% SASL log related
 {sasl_log_dir,   "{{platform_log_dir}}/sasl"}.
 {sasl_error_log, "{{platform_log_dir}}/sasl/sasl-error.log"}.
 
+%% Application log directory
+{app_log_dir,     "{{platform_log_dir}}/app"}.
+%% Directory of ring and cluster-members log directory
+{ring_log_dir,    "{{platform_log_dir}}/ring"}.
+{members_log_dir, "{{platform_log_dir}}/ring"}.
+
 %% Log output level
 %%   0: debug
 %%   1: info

diff --git a/rel/leo_manager/vars/manager_master_vars.config b/rel/leo_manager/vars/manager_master_vars.config
@@ -79,14 +79,19 @@
 
 %% Directory of Mnesia
 {mnesia_dir,     "{{platform_work_dir}}/mnesia"}.
-
 %% Directory of mq's db-file
 {queue_dir,      "{{platform_work_dir}}/queue"}.
-
 %% SASL log related
 {sasl_log_dir,   "{{platform_log_dir}}/sasl"}.
 {sasl_error_log, "{{platform_log_dir}}/sasl/sasl-error.log"}.
 
+%% Application log directory
+{app_log_dir,     "{{platform_log_dir}}/app"}.
+%% Directory of ring and cluster-members log directory
+{ring_log_dir,    "{{platform_log_dir}}/ring"}.
+{members_log_dir, "{{platform_log_dir}}/ring"}.
+
+
 %% Log output level
 %%   0: debug
 %%   1: info

diff --git a/rel/leo_manager/vars/manager_slave_vars.config b/rel/leo_manager/vars/manager_slave_vars.config
@@ -79,14 +79,18 @@
 
 %% Directory of Mnesia
 {mnesia_dir,     "{{platform_work_dir}}/mnesia"}.
-
 %% Directory of mq's db-file
 {queue_dir,      "{{platform_work_dir}}/queue"}.
-
 %% SASL log related
 {sasl_log_dir,   "{{platform_log_dir}}/sasl"}.
 {sasl_error_log, "{{platform_log_dir}}/sasl/sasl-error.log"}.
 
+%% Application log directory
+{app_log_dir,     "{{platform_log_dir}}/app"}.
+%% Directory of ring and cluster-members log directory
+{ring_log_dir,    "{{platform_log_dir}}/ring"}.
+{members_log_dir, "{{platform_log_dir}}/ring"}.
+
 %% Log output level
 %%   0: debug
 %%   1: info

diff --git a/rel/leo_storage/files/app.config b/rel/leo_storage/files/app.config
@@ -92,7 +92,7 @@
                    %%
                    {log_level,    {{log_level}} },
                    {log_appender, [
-                                   {file, [{path, "{{platform_log_dir}}/app"}]}
+                                   {file, [{path, "{{app_log_dir}}" }
                                   ]},
 
                    %% == Directories ==
@@ -120,7 +120,9 @@
                          ]},
     {leo_redundant_manager, [{profile, false},
                              {notify_mf, [leo_manager_api, notify]},
-                             {sync_mf,   [leo_manager_api, synchronize]}
+                             {sync_mf,   [leo_manager_api, synchronize]},
+                             {log_dir_member, "{{ring_log_dir}}" },
+                             {log_dir_ring,   "{{ring_log_dir}}" }
                             ]},
     {leo_statistics, [{profile, false}]}
 ].
diff --git a/rel/leo_storage/vars.config b/rel/leo_storage/vars.config
@@ -52,6 +52,12 @@
 {sasl_log_dir,   "{{platform_log_dir}}/sasl"}.
 {sasl_error_log, "{{platform_log_dir}}/sasl/sasl-error.log"}.
 
+%% Application log directory
+{app_log_dir,     "{{platform_log_dir}}/app"}.
+%% Directory of ring and cluster-members log directory
+{ring_log_dir,    "{{platform_log_dir}}/ring"}.
+{members_log_dir, "{{platform_log_dir}}/ring"}.
+
 %% Log output level
 %%   0: debug
 %%   1: info