aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authoronefang2019-05-19 22:15:41 +1000
committeronefang2019-05-19 22:15:41 +1000
commit295e91b8f44a356ab742dedd27c1b7edfe7b1157 (patch)
treede336b1b137c27f94bd4e0a2fb63bea9b1de60e2 /bin
parentMove db directory out of tree. (diff)
downloadopensim-SC-295e91b8f44a356ab742dedd27c1b7edfe7b1157.zip
opensim-SC-295e91b8f44a356ab742dedd27c1b7edfe7b1157.tar.gz
opensim-SC-295e91b8f44a356ab742dedd27c1b7edfe7b1157.tar.bz2
opensim-SC-295e91b8f44a356ab742dedd27c1b7edfe7b1157.tar.xz
Move cache, config, logs out of tree, and various related clean ups.
Diffstat (limited to '')
-rw-r--r--bin/OpenSim.ConsoleClient.exe.config2
-rw-r--r--[-rwxr-xr-x]bin/OpenSim.exe.config5
-rw-r--r--bin/OpenSim.ini.example4
-rw-r--r--bin/Robust.Tests.dll.config2
-rw-r--r--bin/Robust.exe.config4
l---------bin/addin-db-0012
l---------bin/addin-db-0022
l---------bin/addin-db-0032
l---------bin/addin-db-0042
9 files changed, 13 insertions, 12 deletions
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 @@
18 </appender> 18 </appender>
19 19
20 <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> 20 <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
21 <file value="OpenSim.ConsoleClient.log" /> 21 <file value="../../logs/OpenSim.ConsoleClient.log" />
22 <appendToFile value="true" /> 22 <appendToFile value="true" />
23 <layout type="log4net.Layout.PatternLayout"> 23 <layout type="log4net.Layout.PatternLayout">
24 <conversionPattern value="%date %-5level - %logger %message%newline" /> 24 <conversionPattern value="%date %-5level - %logger %message%newline" />
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config
index 5be6989..690f808 100755..100644
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -24,7 +24,8 @@
24 24
25<!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender: 25<!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender:
26 <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender"> 26 <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
27 <file value="log/OpenSim.log" /> 27 <threshold value="DEBUG" />
28 <file value="../../logs/OpenSim.log" />
28 <rollingStyle value="Date" /> 29 <rollingStyle value="Date" />
29 <datePattern value="'.'yyyy-MM-dd"/> 30 <datePattern value="'.'yyyy-MM-dd"/>
30 ... 31 ...
@@ -44,7 +45,7 @@
44 </appender> 45 </appender>
45 46
46 <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender"> 47 <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
47 <file value="OpenSimStats.log"/> 48 <file value="../../logs/OpenSimStats.log"/>
48 <appendToFile value="true" /> 49 <appendToFile value="true" />
49 <layout type="log4net.Layout.PatternLayout"> 50 <layout type="log4net.Layout.PatternLayout">
50 <conversionPattern value="%date - %message%newline" /> 51 <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 @@
933 ;; co-op will be more stable but this option is currently experimental. 933 ;; co-op will be more stable but this option is currently experimental.
934 ;; If moving from co-op to abort, existing script DLLs will need to be recompiled. 934 ;; If moving from co-op to abort, existing script DLLs will need to be recompiled.
935 ;; This currently can only be done manually, either by setting DeleteScriptsOnStartup = true for one run 935 ;; This currently can only be done manually, either by setting DeleteScriptsOnStartup = true for one run
936 ;; or by deleting the script DLL* files in bin/ScriptEngines/<region-id>/ 936 ;; or by deleting the script DLL* files in ../../caches/ScriptEngines/<region-id>/
937 ;; One can move from co-op back to abort without recompilation, but reverting back to co-op again will need script recompile 937 ;; One can move from co-op back to abort without recompilation, but reverting back to co-op again will need script recompile
938 ;; Current valid values are "abort" and "co-op" 938 ;; Current valid values are "abort" and "co-op"
939 ; ScriptStopStrategy = co-op 939 ; ScriptStopStrategy = co-op
@@ -994,7 +994,7 @@
994 994
995 ;# {ScriptEnginesPath} {} {Path to script assemblies} {} ScriptEngines 995 ;# {ScriptEnginesPath} {} {Path to script assemblies} {} ScriptEngines
996 ;; Path to script engine assemblies 996 ;; Path to script engine assemblies
997 ;; Default is ./bin/ScriptEngines 997 ;; Default is ../../caches/ScriptEngines
998 ; ScriptEnginesPath = "ScriptEngines" 998 ; ScriptEnginesPath = "ScriptEngines"
999 999
1000[OSSL] 1000[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 @@
22 </appender> 22 </appender>
23 23
24 <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> 24 <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
25 <file value="Robust.Tests.log" /> 25 <file value="../../logs/Robust.Tests.log" />
26 <appendToFile value="true" /> 26 <appendToFile value="true" />
27 <filter type="log4net.Filter.LoggerMatchFilter"> 27 <filter type="log4net.Filter.LoggerMatchFilter">
28 <loggerToMatch value="special"/> 28 <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 @@
22 22
23<!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender: 23<!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender:
24 <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender"> 24 <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
25 <file value="log/Robust.log" /> 25 <file value="../../logs/Robust.log" />
26 <rollingStyle value="Date" /> 26 <rollingStyle value="Date" />
27 <datePattern value="'.'yyyy-MM-dd"/> 27 <datePattern value="'.'yyyy-MM-dd"/>
28 ... 28 ...
@@ -41,7 +41,7 @@
41 </appender> 41 </appender>
42 42
43 <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender"> 43 <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
44 <file value="RobustStats.log"/> 44 <file value="../../logs/RobustStats.log"/>
45 <appendToFile value="true" /> 45 <appendToFile value="true" />
46 <layout type="log4net.Layout.PatternLayout"> 46 <layout type="log4net.Layout.PatternLayout">
47 <conversionPattern value="%date - %message%newline" /> 47 <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