Merge branch 'master' of https://code.grnet.gr/git/pithos-ms-client

[pithos-ms-client] / trunk / Pithos.Client.WPF / app.config

diff --git a/trunk/Pithos.Client.WPF/app.config b/trunk/Pithos.Client.WPF/app.config
index d8182e7..6cf45a1 100644 (file)
--- a/trunk/Pithos.Client.WPF/app.config
+++ b/trunk/Pithos.Client.WPF/app.config
@@ -25,18 +25,17 @@
                        </dependentAssembly>
                </assemblyBinding>
        </runtime>
-       <!--<appSettings>
-               <add key="log4net.Internal.Debug" value="true" />
-       </appSettings>
-       <system.diagnostics>
-               <trace autoflush="true">
-                       <listeners>
-                               <add name="textWriterTraceListener"
-                                type="System.Diagnostics.TextWriterTraceListener"
-                                initializeData="e:\\temp\\log4net.txt" />
-                       </listeners>
-               </trace>
-       </system.diagnostics>-->
+
+<system.diagnostics >
+               <sources >
+
+                       <source name="System.Net"  switchValue="Warning" tracemode="protocolonly" maxdatasize="65536" >
+                               <listeners>
+                                       <add name="ms" type="Pithos.Client.WPF.Diagnostics.Log4NetForwarder,PithosPlus" />          
+                               </listeners>        
+                       </source>
+               </sources>
+       </system.diagnostics>
        <userSettings>
                <Pithos.Client.WPF.Properties.Settings>
    <setting name="PithosPath" serializeAs="String">
@@ -108,19 +107,12 @@
    <setting name="DebugLoggingEnabled" serializeAs="String">
     <value>False</value>
    </setting>
+   <setting name="IgnoreCertificateErrors" serializeAs="String">
+    <value>False</value>
+   </setting>
   </Pithos.Client.WPF.Properties.Settings>
        </userSettings>
-       <connectionStrings>
-               <add name="Sqlite_InMemory" providerName="System.Data.SQLite" connectionString="Data Source=:memory:;Version=3;New=True" />
-       </connectionStrings>
-       <system.data>
-               <DbProviderFactories>
-                       <remove invariant="System.Data.SQLite" />
-                       <add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".Net Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" />
-               </DbProviderFactories>
-       </system.data>
-
-       <startup useLegacyV2RuntimeActivationPolicy="true">
+       <startup>
                <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client" />
        </startup>
        <applicationSettings>
@@ -128,20 +120,17 @@
    <setting name="CloudfilesAuthenticationUrl" serializeAs="String">
     <value>https://auth.api.rackspacecloud.com</value>
    </setting>
-   <setting name="PithosLoginUrl" serializeAs="String">
-    <value>https://pithos.dev.grnet.gr/login</value>
-   </setting>
    <setting name="FeedbackUri" serializeAs="String">
     <value>https://pithos.dev.grnet.gr/im/feedback</value>
    </setting>
    <setting name="ProductionServer" serializeAs="String">
-    <value>https://plus.pithos.grnet.gr</value>
+    <value>https://pithos.okeanos.grnet.gr</value>
    </setting>
    <setting name="DevelopmentServer" serializeAs="String">
     <value>https://pithos.dev.grnet.gr</value>
    </setting>
    <setting name="UpdateUrl" serializeAs="String">
-    <value>https://raw.github.com/pkanavos/PithosUpdateTest/master/versioninfo.xml</value>
+    <value>https://code.grnet.gr/projects/pithos-ms-client/repository/revisions/master/raw/trunk/Pithos.Installer/versioninfo.xml</value>
    </setting>
    <setting name="FileIdleTimeout" serializeAs="String">
     <value>00:00:10</value>
@@ -152,7 +141,7 @@
   </Pithos.Client.WPF.Properties.Settings>
        </applicationSettings>
        <log4net>
-               <appender name="TraceAppender" type="log4net.Appender.TraceAppender" >
+               <appender name="TraceAppender" type="log4net.Appender.TraceAppender">
                        <layout type="log4net.Layout.PatternLayout">
                                <conversionPattern value="%logger (%property{CloudFile}) [%level]- %message%newline" />
                        </layout>
@@ -165,17 +154,15 @@
                                <acceptOnMatch value="false" />
                        </filter>
                </appender>
-
                <appender name="DumpFileAppender" type="log4net.Appender.RollingFileAppender">
-                       <file value="log.txt" />
+                       <file value="errorlog.xml" />
                        <appendToFile value="false" />
                        <rollingStyle value="Size" />
                        <maxSizeRollBackups value="10" />
                        <maximumFileSize value="100KB" />
                        <staticLogFileName value="true" />
-                       <layout type="log4net.Layout.XMLLayout"/>
+                       <layout type="log4net.Layout.XMLLayout" />
                </appender>
-
                <appender name="DebugFileAppender" type="log4net.Appender.RollingFileAppender">
                        <file value="debuglog.xml" />
                        <appendToFile value="true" />
@@ -183,29 +170,43 @@
                        <maxSizeRollBackups value="10" />
                        <maximumFileSize value="2MB" />
                        <staticLogFileName value="true" />
-                       <layout type="log4net.Layout.XMLLayout"/>
+                       <layout type="log4net.Layout.XMLLayout" />
                </appender>
-
-               <appender name="OutputDebugStringAppender" type="log4net.Appender.OutputDebugStringAppender" >
+               <appender name="NetworkFileAppender" type="log4net.Appender.RollingFileAppender">
+                       <file value="network.log" />
+                       <appendToFile value="true" />
+                       <rollingStyle value="Size" />
+                       <maxSizeRollBackups value="10" />
+                       <maximumFileSize value="2MB" />
+                       <staticLogFileName value="true" />
+                       <layout type="log4net.Layout.PatternLayout">
+                               <conversionPattern value="%logger (%property{Operation}) [%level]- %message%newline" />
+                       </layout>
+               </appender>
+               <appender name="OutputDebugStringAppender" type="log4net.Appender.OutputDebugStringAppender">
                        <layout type="log4net.Layout.PatternLayout">
                                <conversionPattern value="%logger (%property{Operation}) [%level]- %message%newline" />
                        </layout>
                </appender>
-
                <appender name="LossyFileAppender" type="log4net.Appender.BufferingForwardingAppender">
                        <filter type="log4net.Filter.LevelRangeFilter">
                                <levelMin value="DEBUG" />
                                <levelMax value="FATAL" />
                        </filter>
                        <bufferSize value="30" />
-                       <lossy value="true"/>
+                       <lossy value="true" />
                        <evaluator type="log4net.Core.LevelEvaluator">
                                <threshold value="ERROR" />
                        </evaluator>
                        <appender-ref ref="DumpFileAppender" />
                </appender>
-
-<!--
+               <!--
+               <appender name="MemoryAppender" type="log4net.Appender.MemoryAppender" >
+                       
+                       <threshold value="All" />
+               </appender>
+-->
+               <!--
                <appender name="LossySmtpAppender" type="log4net.Appender.SmtpAppender">
                        <to value="pkanavos@gmail.com" />
                        <from value="pkpithos@gmail.com" />
@@ -224,32 +225,31 @@
                        </layout>
                </appender>
 -->
-
-               <logger name="NHibernate" additivity="false">
-                       <level value="WARN"/>
-                       <appender-ref ref="TraceAppender"/>
+               <logger name="NHibernate" additivity="true">
+                       <level value="WARN" />
+                       <appender-ref ref="TraceAppender" />
                </logger>
-
-<!--
                <logger name="Caliburn" additivity="false">
-                       <level value="WARN"/>
-                       <appender-ref ref="TraceAppender"/>
+                       <level value="WARN" />
+                       <appender-ref ref="TraceAppender" />
                </logger>
--->
-
-               <logger name="Pithos" additivity="false">
-                       <level value="DEBUG"/>
-                       <appender-ref ref="TraceAppender"/>
+               <logger name="Pithos" additivity="true">
+                       <level value="ALL" />
+                       <appender-ref ref="TraceAppender" />
+               </logger>
+               <logger name="System.Net" additivity="true">
+                       <level value="ALL" />
+                       <appender-ref ref="NetworkFileAppender" />
                </logger>
-
                <root>
-                       <level value="DEBUG" />
+                       <level value="ALL" />
                        <appender-ref ref="DebugFileAppender" />
-<!--
                        <appender-ref ref="LossyFileAppender" />
+                       <!--
                        <appender-ref ref="LossySmtpAppender" />
 -->
                        <appender-ref ref="TraceAppender" />
+                       <appender-ref ref="MemoryAppender" />
                        <appender-ref ref="OutputDebugStringAppender" />
                </root>
        </log4net>