From 295e91b8f44a356ab742dedd27c1b7edfe7b1157 Mon Sep 17 00:00:00 2001
From: onefang
Date: Sun, 19 May 2019 22:15:41 +1000
Subject: Move cache, config, logs out of tree, and various related clean ups.

---
 bin/OpenSim.ConsoleClient.exe.config | 2 +-
 bin/OpenSim.exe.config               | 5 +++--
 bin/OpenSim.ini.example              | 4 ++--
 bin/Robust.Tests.dll.config          | 2 +-
 bin/Robust.exe.config                | 4 ++--
 bin/addin-db-001                     | 2 +-
 bin/addin-db-002                     | 2 +-
 bin/addin-db-003                     | 2 +-
 bin/addin-db-004                     | 2 +-
 9 files changed, 13 insertions(+), 12 deletions(-)
 mode change 100755 => 100644 bin/OpenSim.exe.config

(limited to 'bin')

diff --git a/bin/OpenSim.ConsoleClient.exe.config b/bin/OpenSim.ConsoleClient.exe.config
index 3a50408..6542517 100644
--- a/bin/OpenSim.ConsoleClient.exe.config
+++ b/bin/OpenSim.ConsoleClient.exe.config
@@ -18,7 +18,7 @@
     </appender>
 
     <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="OpenSim.ConsoleClient.log" />
+      <file value="../../logs/OpenSim.ConsoleClient.log" />
       <appendToFile value="true" />
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date %-5level - %logger %message%newline" />
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config
old mode 100755
new mode 100644
index 5be6989..690f808
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -24,7 +24,8 @@
 
 <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender:
     <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
-      <file value="log/OpenSim.log" />
+      <threshold value="DEBUG" />
+      <file value="../../logs/OpenSim.log" />
       <rollingStyle value="Date" />
       <datePattern value="'.'yyyy-MM-dd"/>
       ...
@@ -44,7 +45,7 @@
     </appender>
 
     <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="OpenSimStats.log"/>
+      <file value="../../logs/OpenSimStats.log"/>
       <appendToFile value="true" />
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date - %message%newline" />
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index c610b3f..fbf2c8b 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -933,7 +933,7 @@
     ;; co-op will be more stable but this option is currently experimental.
     ;; If moving from co-op to abort, existing script DLLs will need to be recompiled.
     ;; This currently can only be done manually, either by setting DeleteScriptsOnStartup = true for one run
-    ;; or by deleting the script DLL* files in bin/ScriptEngines/<region-id>/
+    ;; or by deleting the script DLL* files in ../../caches/ScriptEngines/<region-id>/
     ;; One can move from co-op back to abort without recompilation, but reverting back to co-op again will need script recompile
     ;; Current valid values are "abort" and "co-op"
     ; ScriptStopStrategy = co-op
@@ -994,7 +994,7 @@
 
     ;# {ScriptEnginesPath} {} {Path to script assemblies} {} ScriptEngines
     ;; Path to script engine assemblies
-    ;; Default is ./bin/ScriptEngines
+    ;; Default is ../../caches/ScriptEngines
     ; ScriptEnginesPath = "ScriptEngines"
 
 [OSSL]
diff --git a/bin/Robust.Tests.dll.config b/bin/Robust.Tests.dll.config
index a4c43e7..cc0bead 100644
--- a/bin/Robust.Tests.dll.config
+++ b/bin/Robust.Tests.dll.config
@@ -22,7 +22,7 @@
     </appender>
 
     <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="Robust.Tests.log" />
+      <file value="../../logs/Robust.Tests.log" />
       <appendToFile value="true" />
       <filter type="log4net.Filter.LoggerMatchFilter">
         <loggerToMatch value="special"/>
diff --git a/bin/Robust.exe.config b/bin/Robust.exe.config
index 3ad5f31..03c8f4e 100644
--- a/bin/Robust.exe.config
+++ b/bin/Robust.exe.config
@@ -22,7 +22,7 @@
 
 <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender:
     <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
-      <file value="log/Robust.log" />
+      <file value="../../logs/Robust.log" />
       <rollingStyle value="Date" />
       <datePattern value="'.'yyyy-MM-dd"/>
       ...
@@ -41,7 +41,7 @@
     </appender>
 
     <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="RobustStats.log"/>
+      <file value="../../logs/RobustStats.log"/>
       <appendToFile value="true" />
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date - %message%newline" />
diff --git a/bin/addin-db-001 b/bin/addin-db-001
index dbc4433..95ce512 120000
--- a/bin/addin-db-001
+++ b/bin/addin-db-001
@@ -1 +1 @@
-../caches/addin-db-001
\ No newline at end of file
+../../caches/addin-db-001
\ No newline at end of file
diff --git a/bin/addin-db-002 b/bin/addin-db-002
index 3c0d6dc..fbf0070 120000
--- a/bin/addin-db-002
+++ b/bin/addin-db-002
@@ -1 +1 @@
-../caches/addin-db-002
\ No newline at end of file
+../../caches/addin-db-002
\ No newline at end of file
diff --git a/bin/addin-db-003 b/bin/addin-db-003
index 0716d8b..182e326 120000
--- a/bin/addin-db-003
+++ b/bin/addin-db-003
@@ -1 +1 @@
-../caches/addin-db-003
\ No newline at end of file
+../../caches/addin-db-003
\ No newline at end of file
diff --git a/bin/addin-db-004 b/bin/addin-db-004
index 17214ff..3d818ca 120000
--- a/bin/addin-db-004
+++ b/bin/addin-db-004
@@ -1 +1 @@
-../caches/addin-db-004
\ No newline at end of file
+../../caches/addin-db-004
\ No newline at end of file
-- 
cgit v1.1