rhodes 2.4.1 → 3.0.0.beta.1

data/platform/wp7/RhoRubyLib/RhoRubyLib.csproj

@@ -46,21 +46,21 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="IronRuby">
-      <HintPath>..\..\..\..\ironruby\bin\Silverlight3$(Configuration)\IronRuby.dll</HintPath>
+      <HintPath>..\ironruby\bin\Silverlight3$(Configuration)\IronRuby.dll</HintPath>
     </Reference>
     <Reference Include="IronRuby.Libraries">
-      <HintPath>..\..\..\..\ironruby\bin\Silverlight3$(Configuration)\IronRuby.Libraries.dll</HintPath>
+      <HintPath>..\ironruby\bin\Silverlight3$(Configuration)\IronRuby.Libraries.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Phone" />
     <Reference Include="Microsoft.Phone.Interop" />
     <Reference Include="Microsoft.Scripting">
-      <HintPath>..\..\..\..\ironruby\bin\Silverlight3$(Configuration)\Microsoft.Scripting.dll</HintPath>
+      <HintPath>..\ironruby\bin\Silverlight3$(Configuration)\Microsoft.Scripting.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Scripting.Core">
-      <HintPath>..\..\..\..\ironruby\bin\Silverlight3$(Configuration)\Microsoft.Scripting.Core.dll</HintPath>
+      <HintPath>..\ironruby\bin\Silverlight3$(Configuration)\Microsoft.Scripting.Core.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Dynamic">
-      <HintPath>..\..\..\..\ironruby\bin\Silverlight3$(Configuration)\Microsoft.Dynamic.dll</HintPath>
+      <HintPath>..\ironruby\bin\Silverlight3$(Configuration)\Microsoft.Dynamic.dll</HintPath>
     </Reference>
     <Reference Include="System.Windows" />
     <Reference Include="system" />
@@ -78,6 +78,8 @@
     <Compile Include="db\SqliteCopyResult.cs" />
     <Compile Include="json\JsonParser.cs" />
     <Compile Include="json\RJSONTokener.cs" />
+    <Compile Include="logging\RhoEmptyLogger.cs" />
+    <Compile Include="logging\RhoLogServerSink.cs" />
     <Compile Include="net\AsyncHttp.cs" />
     <Compile Include="RhoAppAdapter.cs" />
     <Compile Include="common\Mutex.cs" />

data/platform/wp7/RhoRubyLib/WP_PlatformAdaptationLayer.cs

@@ -68,7 +68,7 @@ namespace rho
 
         public override Stream OpenInputFileStream(string path)
         {
-            System.Diagnostics.Debug.WriteLine("open_file: " + path, "");
+            //System.Diagnostics.Debug.WriteLine("open_file: " + path, "");
 
             StreamResourceInfo sr = Application.GetResourceStream(new Uri(CFilePath.removeFirstSlash(path), UriKind.Relative));
             if (sr == null)

data/platform/wp7/RhoRubyLib/common/RhoParams.cs

@@ -19,7 +19,7 @@ namespace rho.common
             m_pParams = copy.m_pParams;
         }
 
-        protected Object findHashParam(String name)
+        public Object findHashParam(String name)
         {
     	    if ( !(m_pParams is Hash) ) 
     		    return null;

data/platform/wp7/RhoRubyLib/common/ThreadQueue.cs

@@ -9,7 +9,10 @@ namespace rho.common
 	
 	    public void setLogCategory(String category)
 	    {
-		    LOG.setLogCategory(category);
+            if (category != null)
+                LOG.setLogCategory(category);
+            else
+                LOG = new RhoEmptyLogger();
 	    }
 	
 	    public static int QUEUE_POLL_INTERVAL_SECONDS  = 300;

data/platform/wp7/RhoRubyLib/db/DBAdapter.cs

@@ -212,7 +212,7 @@ namespace rho.db
 		return res; 
 	}
 	
-	public IDBResult executeSQLReportNonUniqueEx(String strStatement, Vector<String> vecValues){
+	public IDBResult executeSQLReportNonUniqueEx(String strStatement, Vector<Object> vecValues){
 		//LOG.TRACE("executeSQLReportNonUnique: " + strStatement);
 		
 		Object[] values = new Object[vecValues.size()];
@@ -231,7 +231,7 @@ namespace rho.db
 		return res; 
 	}
 	
-	public IDBResult executeSQLEx(String strStatement, Vector<String> vecValues){
+	public IDBResult executeSQLEx(String strStatement, Vector<Object> vecValues){
 		Object[] values = new Object[vecValues.size()];
 		for (int i = 0; i < vecValues.size(); i++ )
 			values[i] = vecValues.elementAt(i);

data/platform/wp7/RhoRubyLib/logging/IRhoLogSink.cs

@@ -2,7 +2,7 @@
 
 namespace rho.logging
 {
-    interface IRhoLogSink
+    public interface IRhoLogSink
     {
         void writeLogMessage(String strMsg);
         int getCurPos();

data/platform/wp7/RhoRubyLib/logging/RhoEmptyLogger.cs

@@ -0,0 +1,30 @@
+using System;
+using rho.logging;
+
+namespace rho.common
+{
+    public class RhoEmptyLogger : RhoLogger
+    {
+        protected override void logMessage(int severity, String msg, Exception e, boolean bOutputOnly)
+        {
+        }
+
+        public override void FATAL(String message, Exception e)
+        {
+		    processFatalError();
+	    }
+
+	    public override void FATAL(String message) {
+		    processFatalError();
+	    }
+
+        public override void FATAL(Exception e)
+        {
+		    processFatalError();
+	    }
+
+	    public RhoEmptyLogger() : base(""){
+	
+	    }
+    }
+}

data/platform/wp7/RhoRubyLib/logging/RhoLogConf.cs

@@ -18,9 +18,12 @@ namespace rho.logging
 
     IRhoLogSink   m_pFileSink = null;
     IRhoLogSink   m_pOutputSink = null;
+    IRhoLogSink   m_pServerSink = null;
     Mutex m_FlushLock = new Mutex();
     Mutex m_CatLock = new Mutex();
 
+    public IRhoLogSink getOutputSink() { return m_pOutputSink; }
+
 	public RhoLogConf(){
 		m_pFileSink = new rho.logging.RhoLogFileSink(this);
 		m_pOutputSink = new rho.logging.RhoLogOutputSink(this);
@@ -30,6 +33,9 @@ namespace rho.logging
     {
         if (m_pFileSink != null)
             m_pFileSink.close();
+
+        if (m_pServerSink != null)
+            m_pServerSink.close();
 	}
 	
 	RhoConf RHOCONF(){ return RhoConf.getInstance(); }
@@ -93,6 +99,8 @@ namespace rho.logging
     public void setMaxLogFileSize(int nMaxSize) { m_nMaxLogFileSize = nMaxSize; }
     public int getMaxLogFileSize(){ return m_nMaxLogFileSize; }
 
+    public void setServerSynk(IRhoLogSink pServerSynk) { m_pServerSink = pServerSynk; }
+
     public boolean isLogPrefix(){ return m_bLogPrefix;}
     public void setLogPrefix(boolean bLogPrefix){ m_bLogPrefix = bLogPrefix;}
 
@@ -136,6 +144,8 @@ namespace rho.logging
         //Should be at the end
         if ( isLogToOutput() )
             m_pOutputSink.writeLogMessage(strMsg);
+
+        m_pServerSink.writeLogMessage(strMsg);
     	
     }
     

data/platform/wp7/RhoRubyLib/logging/RhoLogFileSink.cs

@@ -163,7 +163,12 @@ namespace rho.logging
 
         public void writeLogMessage(String strMsg) 
         {
-            System.Diagnostics.Debug.WriteLine(strMsg);
+#if DEBUG
+            if ( strMsg.charAt(strMsg.length() - 1) != '\n' )
+                System.Diagnostics.Debug.WriteLine(strMsg);
+            else
+                System.Diagnostics.Debug.WriteLine(strMsg.Substring(0, strMsg.length() - 1));
+#endif
 	    }
 
         public void clear()

data/platform/wp7/RhoRubyLib/logging/RhoLogServerSink.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Net;
+using System.Threading;
+using System.ComponentModel;
+using IronRuby.Builtins;
+using System.Collections.Generic;
+using rho.net;
+using rho.common;
+
+namespace rho.logging
+{
+    public class RhoLogServerSink : IRhoLogSink
+    {
+        private static RhoLogConf m_oLogConf;
+        RhoConf RHOCONF() { return RhoConf.getInstance(); }
+        CAsyncHttp m_aHttp = new CAsyncHttp(true);
+        String m_addrHost = "";
+
+        public RhoLogServerSink(RhoLogConf conf)
+        {
+            m_oLogConf = conf;
+            m_addrHost = "http://"+RHOCONF().getString("rhologhost") + ":" + RHOCONF().getString("rhologport");
+        }
+
+        public void close()
+        {
+            if (m_aHttp != null)
+                m_aHttp.stop(2);
+        }
+
+        private RhoLogConf getLogConf()
+        {
+            return m_oLogConf;
+        }
+
+        public int getCurPos()
+        {
+            return 0;
+        }
+
+        public void writeLogMessage(String strMsg)
+        {
+            IDictionary<object, object> map = new Dictionary<object, object>();
+            Hash values = new Hash(map);
+            values.Add(MutableString.Create("url"), MutableString.Create(m_addrHost));
+            values.Add(MutableString.Create("body"), MutableString.Create(strMsg));
+            RhoParams p = new RhoParams(values);
+            m_aHttp.addHttpCommand(new CAsyncHttp.HttpCommand("POST", p));
+        }
+
+        public void clear()
+        {
+
+        }
+    }
+}

data/platform/wp7/RhoRubyLib/logging/RhoLogger.cs

@@ -20,6 +20,7 @@ namespace rho.common
 	    private String m_strMessage;
 	    private int    m_severity;
 	    private static Mutex m_SinkLock = new Mutex();
+        private static Mutex m_SinkLock2 = new Mutex();
 	    //private static IRhoRubyHelper m_sysInfo;
 	    public static String LOGFILENAME = "RhoLog.txt";
 
@@ -57,7 +58,18 @@ namespace rho.common
 			
 		    return "0" + nDigit.ToString();
 	    }
-	
+
+        private String get3FixedDigit(int nDigit)
+        {
+            if (nDigit > 99)
+                return nDigit.ToString();
+
+            if (nDigit > 9 )
+                return "0" + nDigit.ToString();
+
+            return "00" + nDigit.ToString();
+        }
+
 	    private String getLocalTimeString()
         {
             DateTime time = DateTime.Now;
@@ -72,7 +84,7 @@ namespace rho.common
 			    get2FixedDigit(time.Second);
 			
 			    //if ( false ) //comment this to show milliseconds
-				    strTime += ":" + get2FixedDigit(time.Millisecond);
+				    strTime += ":" + get3FixedDigit(time.Millisecond);
 			
 		    return strTime;
 	    }
@@ -137,7 +149,7 @@ namespace rho.common
 	        logMessage(severity, msg, e, false );
         }
 
-        private void logMessage(int severity, String msg, Exception e, boolean bOutputOnly)
+        protected virtual void logMessage(int severity, String msg, Exception e, boolean bOutputOnly)
         {
             m_severity = severity;
 		    if ( !isEnabled() )
@@ -168,7 +180,7 @@ namespace rho.common
 			
 		    if ( bOutputOnly )
 		    {
-                System.Diagnostics.Debug.WriteLine(m_strMessage);
+                getLogConf().getOutputSink().writeLogMessage(m_strMessage);
 		    }else
 		    {
 		        lock( m_SinkLock ){
@@ -246,15 +258,15 @@ namespace rho.common
             //EventLogger.logEvent(EVENT_GUID, m_strMessage.getBytes());
         }
 
-        public void FATAL(String message)
+        public virtual void FATAL(String message)
         {
             logMessage(L_FATAL, message);
         }
-        public void FATAL(Exception e)
+        public virtual void FATAL(Exception e)
         {
             logMessage(L_FATAL, "", e);
         }
-        public void FATAL(String message, Exception e)
+        public virtual void FATAL(String message, Exception e)
         {
             logMessage(L_FATAL, message, e);
         }
@@ -287,6 +299,8 @@ namespace rho.common
     	    m_oLogConf.setLogPrefix(true);		
     	
     	    m_oLogConf.setLogToFile(true);
+
+            //TODO - if ip is empy in rhoconfig then we have to set to false
         
 		    if ( isSimulator() ) {
 			    m_oLogConf.setMinSeverity( L_INFO );
@@ -310,11 +324,10 @@ namespace rho.common
     	    //
     	    RhoConf.getInstance().loadConf();
     	    m_oLogConf.loadFromConf(RhoConf.getInstance());
+
+            if (RhoConf.getInstance().getString("rhologhost") != null)
+                m_oLogConf.setServerSynk(new rho.logging.RhoLogServerSink(m_oLogConf));
         }
     }
 
-    public class RhoEmptyLogger : RhoLogger
-    {
-        public RhoEmptyLogger() : base("") { }
-    }
 }

data/platform/wp7/RhoRubyLib/net/AsyncHttp.cs

@@ -19,11 +19,13 @@ namespace rho.net
 {
     public class CAsyncHttp : CThreadQueue 
     {
-        private static RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : 
+        private RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : 
 		    new RhoLogger("AsyncHttp");
+        public RhoLogger getLog() { return LOG;  }
 	    private static CRhodesApp RHODESAPP(){ return CRhodesApp.Instance; }
-	
+	    
         static CAsyncHttp m_pInstance;
+        private bool m_bInternal = false;
 
         public static CAsyncHttp Create()
         {
@@ -38,8 +40,7 @@ namespace rho.net
         {
             if (m_pInstance != null)
             {
-                m_pInstance.stop(-1);
-                LOG.INFO("Thread shutdown");
+                m_pInstance.stop(2);
 
                 m_pInstance = null;
             }
@@ -47,9 +48,18 @@ namespace rho.net
 
         public static CAsyncHttp getInstance(){ return m_pInstance; }
     
-        public CAsyncHttp()
+        public CAsyncHttp(bool bInternal = false)
         {
-            base.setLogCategory(LOG.getLogCategory());
+            m_bInternal = bInternal;
+            if (!m_bInternal)
+            {
+                base.setLogCategory(LOG.getLogCategory());
+            }
+            else
+            {
+                LOG = new RhoEmptyLogger();
+                base.setLogCategory(null);
+            }
 
             setPollInterval(QUEUE_POLL_INTERVAL_INFINITE);
         }
@@ -85,19 +95,39 @@ namespace rho.net
             }   
         }
 
-        public MutableString addHttpCommand(IQueueCommand pCmd)
+        public MutableString addHttpCommand(HttpCommand pCmd)
         {
-            if (((HttpCommand)pCmd).m_strCallback.length() == 0)
+            pCmd.setLog(LOG);
+            pCmd.setInternal(m_bInternal);
+            if (!m_bInternal && pCmd.m_strCallback.length() == 0)
             {
                 processCommandBase(pCmd);
-                return ((HttpCommand)pCmd).getRetValue();
+                return pCmd.getRetValue();
             }
             else
             {
-                addQueueCommand(pCmd);
+                if (m_bInternal)
+                {
+                    lock (getCommandLock())
+                    {
+                        if (getCommands().isEmpty())
+                            addQueueCommand(pCmd);
+                        else
+                        {
+                            HttpCommand cmd = getCommands().get(0) as HttpCommand;
+                            MutableString rString = cmd.m_params.findHashParam("body") as MutableString;
+                            MutableString rString2 = pCmd.m_params.findHashParam("body") as MutableString;
+
+                            rString.Append(rString2);
+                        }
+                    }
+                }else
+                    addQueueCommand(pCmd);
+
+
                 start(epLow);
 
-                return ((HttpCommand)pCmd).getRetValue();
+                return pCmd.getRetValue();
             }
         }
 
@@ -110,6 +140,9 @@ namespace rho.net
 
         public class HttpCommand : IQueueCommand
         {
+            private RhoLogger LOG;
+            public void setLog(RhoLogger log) { LOG = log; m_pNetRequest.setLog(LOG);  }
+
 	        int m_eCmd;
             public String m_strCallback, m_strCallbackParams;
             Hashtable<String, String> m_mapHeaders = new Hashtable<String, String>();
@@ -118,7 +151,9 @@ namespace rho.net
             String m_strResBody;
             private MutableString m_valBody;    
         
-            RhoParams    m_params;
+            public RhoParams    m_params;
+            bool m_bInternal = false;
+            public void setInternal(bool b) { m_bInternal = b;  }
 
             public HttpCommand(String strCmd, RhoParams p)
             {
@@ -268,6 +303,9 @@ namespace rho.net
 
         void callNotify(NetResponse resp, int nError )
         {
+            if (m_bInternal)
+                return;
+
             m_strResBody = "rho_callback=1";
             m_strResBody += "&status=";
             if ( nError > 0 )
@@ -315,8 +353,13 @@ namespace rho.net
         
         public MutableString getRetValue()
         {
-    	    if ( m_strCallback.length() == 0 )
-    	        return CRhoRuby.create_string(m_strResBody); 
+            if (m_strCallback.length() == 0)
+            {
+             if(m_strResBody == null)
+                 return CRhoRuby.create_string("");
+             else
+                return CRhoRuby.create_string(m_strResBody);
+            }
 
     	    return null;
         }