update

cloupid · Apr 13, 2016 · d5b93fe · d5b93fe
1 parent 5e88c07
commit d5b93fe
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 13 deletions.
diff --git a/app.conf b/app.conf
@@ -1,2 +1,2 @@
-redisHost:redis_primary
+redisHost:redis
 redisPassword:#frAiI^MtFxh3Ks&swrnVyzAtRTq%w
diff --git a/src/Java2Dotnet.Spider.Common/ConfigurationManager.cs b/src/Java2Dotnet.Spider.Common/ConfigurationManager.cs
@@ -11,7 +11,7 @@ public class ConfigurationManager
 
 		static ConfigurationManager()
 		{            
-            string configPath=Directory.GetCurrentDirectory()+"/app.conf";
+            string configPath= Path.Combine(AppContext.BaseDirectory,"app.conf");
 			if (File.Exists(configPath))
 			{
 				string[] lines = File.ReadAllLines(configPath);

diff --git a/src/Java2Dotnet.Spider.Common/RedisServer.cs b/src/Java2Dotnet.Spider.Common/RedisServer.cs
@@ -1641,7 +1641,7 @@ private RedisResult GetResult()
 				redisResult.Result = msg;
 				return redisResult;
 			}
-			redisResult.Exeption = new Exception("Unexpected reply: ");
+			redisResult.Exeption = new Exception($"Unexpected reply: {redisResult.Flag} {msg}");
 			return redisResult;
 		}
 

diff --git a/src/Java2Dotnet.Spider.Core/Spider.cs b/src/Java2Dotnet.Spider.Core/Spider.cs
@@ -141,7 +141,7 @@ protected Spider(string identify, IPageProcessor pageProcessor, IScheduler sched
 
 			DataRootDirectory = AppDomain.CurrentDomain.BaseDirectory + "\\data\\" + Identity;
 #else
-			DataRootDirectory = Path.Combine(Directory.GetCurrentDirectory(), Path.Combine("data", Identity));
+			DataRootDirectory = Path.Combine(AppContext.BaseDirectory, Path.Combine("data", Identity));
 #endif
 		}
 

diff --git a/src/Java2Dotnet.Spider.Core/Utils/FilePersistentBase.cs b/src/Java2Dotnet.Spider.Core/Utils/FilePersistentBase.cs
@@ -37,7 +37,7 @@ protected void SetPath(string path)
 #if !NET_CORE
 			BasePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, path);
 #else
-			BasePath = Path.Combine(Directory.GetCurrentDirectory(), path);
+			BasePath = Path.Combine(AppContext.BaseDirectory, path);
 #endif
 		}
 

diff --git a/src/Java2Dotnet.Spider.Extension/Environment.cs b/src/Java2Dotnet.Spider.Extension/Environment.cs
@@ -11,7 +11,7 @@ public static string GetDataFilePath(ISpider spider, string name)
 #if !NET_CORE
 			string folderPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "data", spider.Identity);
 #else
-			string folderPath = Path.Combine(Directory.GetCurrentDirectory(), "data", spider.Identity);
+			string folderPath = Path.Combine(AppContext.BaseDirectory, "data", spider.Identity);
 #endif
 			if (!Directory.Exists(folderPath))
 			{

diff --git a/src/Java2Dotnet.Spider.Extension/ScriptSpider.cs b/src/Java2Dotnet.Spider.Extension/ScriptSpider.cs
@@ -232,6 +232,7 @@ private Core.Spider PrepareSpider(params string[] args)
 							else
 							{
 								Console.WriteLine("No need to prepare site because other process did it.");
+                                _spiderContext.Site.ClearStartRequests();
 							}
 
 							Console.WriteLine("Start creating Spider...");

diff --git a/src/Java2Dotnet.Spider.JLog/Log.cs b/src/Java2Dotnet.Spider.JLog/Log.cs
@@ -14,7 +14,7 @@ public class Log : ILog
 
 		static Log()
 		{
-			LogFile = Path.Combine(Directory.GetCurrentDirectory(), DateTime.Now.ToString("yyyy-MM-dd") + ".log");
+			LogFile = Path.Combine(AppContext.BaseDirectory, DateTime.Now.ToString("yyyy-MM-dd") + ".log");
 		}
 
 		public Log(string name)

diff --git a/src/Java2Dotnet.Spider.Test/Example/JdSkuSample.cs b/src/Java2Dotnet.Spider.Test/Example/JdSkuSample.cs
@@ -33,7 +33,7 @@ protected override SpiderContext CreateSpiderContext()
 				},
 				Scheduler = new RedisScheduler
 				{
-					Host = "redis_primary",
+					Host = "redis",
                     Password="#frAiI^MtFxh3Ks&swrnVyzAtRTq%w",
 					Port = 6379
 				},

diff --git a/src/MySql.Data/Driver.cs b/src/MySql.Data/Driver.cs
@@ -227,13 +227,14 @@ public virtual void Configure(MySqlConnection connection)
 					if (Pool != null && Settings.CacheServerProperties)
 					{
 						if (Pool.ServerProperties == null)
-							Pool.ServerProperties = LoadServerProperties(connection);
+						{
+                            Pool.ServerProperties = LoadServerProperties(connection);
+                        }
 						serverProps = Pool.ServerProperties;
 					}
-					else{
-						Console.WriteLine("LoadServerProperties");
-						serverProps = LoadServerProperties(connection);
-
+					else
+                    {
+						serverProps = LoadServerProperties(connection);						
 					}
 
 					LoadCharacterSets(connection);
-Original file line number
+Diff line change
@@ Expand Up @@
     			DataRootDirectory = AppDomain.CurrentDomain.BaseDirectory + "\\data\\" + Identity;
     #else
-    			DataRootDirectory = Path.Combine(Directory.GetCurrentDirectory(), Path.Combine("data", Identity));
+    			DataRootDirectory = Path.Combine(AppContext.BaseDirectory, Path.Combine("data", Identity));
     #endif
     		}
@@ Expand Down @@