Merge pull request #21 from GsDevKit/issue_19

Issue #19: it turns out that the `initCrashLog` call in GemServer>>start...
GsDevKit · Jan 17, 2015 · 9320fab · 9320fab
2 parents b5755dc + 3a653c9
commit 9320fab
Show file tree

Hide file tree

Showing 39 changed files with 88 additions and 38 deletions.
diff --git a/...Tools-ExampleV31.package/GemServerRemoteServerExampleTests.class/instance/restartGems..st b/...Tools-ExampleV31.package/GemServerRemoteServerExampleTests.class/instance/restartGems..st
@@ -0,0 +1,3 @@
+private
+restartGems: gemServer
+  gemServer restartGems
diff --git a/...ampleV31.package/GemServerRemoteServerExampleTests.class/instance/runTest.client.task..st b/...ampleV31.package/GemServerRemoteServerExampleTests.class/instance/runTest.client.task..st
@@ -1,4 +1,4 @@
-tests
+private
 runTest: gemServer client: client task: task
   [ 
   self startGems: gemServer.

diff --git a/...onTools-ExampleV31.package/GemServerRemoteServerExampleTests.class/instance/startGems..st b/...onTools-ExampleV31.package/GemServerRemoteServerExampleTests.class/instance/startGems..st
@@ -1,3 +1,4 @@
 private
 startGems: gemServer
+  gemServer initCrashLog.	"make sure we have a clean slate when starting up"
   gemServer startGems
diff --git a/...31.package/GemServerRemoteServerExampleTests.class/instance/testStartRestartStopServer.st b/...31.package/GemServerRemoteServerExampleTests.class/instance/testStartRestartStopServer.st
@@ -0,0 +1,23 @@
+tests
+testStartRestartStopServer
+  "just start/restart/stop ... without an http client cannot do much else"
+
+  "https://github.com/GsDevKit/gsApplicationTools/issues/19"
+
+  | gemServer |
+  gemServer := GemServer gemServerNamed: self gemServerName.
+  gemServer tracing: true.
+  gemServer scriptLogEvent: '---->testStartRestartStopServer' object: gemServer.
+  [ 
+  | portCount |
+  self startGems: gemServer.
+  (Delay forSeconds: 3) wait.
+  portCount := self validatePidFile: gemServer shouldExist: true.
+  self assert: portCount = gemServer defaultPortOrResourceNameList size.
+  gemServer restartGems.
+  (Delay forSeconds: 3) wait.
+  self validatePidFile: gemServer shouldExist: true ]
+    ensure: [ 
+      self stopGems: gemServer.
+      (Delay forSeconds: 3) wait.
+      self validatePidFile: gemServer shouldExist: false ]
diff --git a/....package/GemServerRemoteServerExampleTests.class/instance/validatePidFile.shouldExist..st b/....package/GemServerRemoteServerExampleTests.class/instance/validatePidFile.shouldExist..st
@@ -0,0 +1,16 @@
+private
+validatePidFile: gemServer shouldExist: shouldExist
+  | portCount |
+  portCount := 0.
+  gemServer defaultPortOrResourceNameList
+    do: [ :defaultPortOrResourceName | 
+      | fileName |
+      portCount := portCount + 1.
+      fileName := gemServer gemPidFileName: defaultPortOrResourceName.
+      ServerFileDirectory
+        splitName: fileName
+        to: [ :dirPath :fileName | 
+          | dir x |
+          dir := ServerFileDirectory on: dirPath.
+          self assert: (x := dir fileExists: fileName) == shouldExist ] ].
+  ^ portCount
diff --git a/...ionTools-ExampleV31.package/GemServerRemoteServerExampleTests.class/methodProperties.json b/...ionTools-ExampleV31.package/GemServerRemoteServerExampleTests.class/methodProperties.json
@@ -5,10 +5,11 @@
 		"gemClientClass" : "dkh 12/30/2014 12:44",
 		"gemServerClass" : "dkh 12/26/2014 14:47",
 		"gemServerName" : "dkh 12/23/2014 13:28",
+		"restartGems:" : "dkh 01/15/2015 12:22",
 		"runTest:client:task:" : "dkh 01/01/2015 11:17",
 		"scheduledTaskList" : "dkh 12/26/2014 18:17",
-		"setUp" : "dkh 01/09/2015 17:20",
-		"startGems:" : "dkh 12/23/2014 13:04",
+		"setUp" : "dkh 12/26/2014 14:47",
+		"startGems:" : "dkh 01/15/2015 12:35",
 		"stopGems:" : "dkh 12/23/2014 15:53",
 		"taskList100" : "dkh 01/02/2015 09:20",
 		"tearDown" : "dkh 01/06/2015 13:41",
@@ -21,7 +22,9 @@
 		"testOutOfMemoryTemp" : "dkh 01/06/2015 13:42",
 		"testSimple" : "dkh 01/06/2015 13:42",
 		"testStackOverflow" : "dkh 01/06/2015 13:42",
+		"testStartRestartStopServer" : "dkh 01/15/2015 12:31",
 		"testStatus" : "dkh 01/06/2015 13:42",
 		"testTimeInLondon" : "dkh 01/06/2015 13:42",
 		"testWarning" : "dkh 01/06/2015 13:42",
+		"validatePidFile:shouldExist:" : "dkh 01/15/2015 12:25",
 		"waitForTasks:gemServer:client:" : "dkh 01/01/2015 11:19" } }
diff --git a/...mpleV31.package/GemServerRemoteServerParallelProcessingExampleTests.class/properties.json b/...mpleV31.package/GemServerRemoteServerParallelProcessingExampleTests.class/properties.json
@@ -4,7 +4,7 @@
 		 ],
 	"classvars" : [
 		 ],
-	"commentStamp" : "",
+	"commentStamp" : "dkh 12/30/2014 12:46",
 	"instvars" : [
 		 ],
 	"name" : "GemServerRemoteServerParallelProcessingExampleTests",

diff --git a/...xampleV31.package/GemServerRemoteServerSerialProcessingExampleTests.class/properties.json b/...xampleV31.package/GemServerRemoteServerSerialProcessingExampleTests.class/properties.json
@@ -4,7 +4,7 @@
 		 ],
 	"classvars" : [
 		 ],
-	"commentStamp" : "",
+	"commentStamp" : "dkh 12/30/2014 12:46",
 	"instvars" : [
 		 ],
 	"name" : "GemServerRemoteServerSerialProcessingExampleTests",

diff --git a/...ols-ExampleV31.package/GemServerRemoteTaskParallelProcessingExample.class/properties.json b/...ols-ExampleV31.package/GemServerRemoteTaskParallelProcessingExample.class/properties.json
@@ -4,7 +4,7 @@
 		 ],
 	"classvars" : [
 		 ],
-	"commentStamp" : "",
+	"commentStamp" : "dkh 12/31/2014 20:50",
 	"instvars" : [
 		 ],
 	"name" : "GemServerRemoteTaskParallelProcessingExample",

diff --git a/...Tools-ExampleV31.package/GemServerRemoteTaskSerialProcessingExample.class/properties.json b/...Tools-ExampleV31.package/GemServerRemoteTaskSerialProcessingExample.class/properties.json
@@ -4,7 +4,7 @@
 		 ],
 	"classvars" : [
 		 ],
-	"commentStamp" : "",
+	"commentStamp" : "dkh 12/31/2014 20:51",
 	"instvars" : [
 		 ],
 	"name" : "GemServerRemoteTaskSerialProcessingExample",

diff --git a/...onTools-ExampleV31.package/GemServerSeasideStyleExampleTests.class/instance/startGems..st b/...onTools-ExampleV31.package/GemServerSeasideStyleExampleTests.class/instance/startGems..st
@@ -1,3 +1,4 @@
 private
 startGems: gemServer
+  gemServer initCrashLog.
   gemServer startGems
diff --git a/...ionTools-ExampleV31.package/GemServerSeasideStyleExampleTests.class/methodProperties.json b/...ionTools-ExampleV31.package/GemServerSeasideStyleExampleTests.class/methodProperties.json
@@ -4,8 +4,8 @@
 	"instance" : {
 		"gemServerName" : "dkh 01/02/2015 11:10",
 		"runTest:" : "dkh 01/02/2015 11:45",
-		"setUp" : "dkh 01/09/2015 17:20",
-		"startGems:" : "dkh 01/02/2015 11:11",
+		"setUp" : "dkh 01/02/2015 14:45",
+		"startGems:" : "dkh 01/15/2015 12:34",
 		"stopGems:" : "dkh 01/02/2015 11:11",
 		"tearDown" : "dkh 01/06/2015 13:42",
 		"testSeasideStyleError" : "dkh 01/06/2015 13:42",

diff --git a/repository/GsApplicationTools-ExampleV31.package/monticello.meta/version b/repository/GsApplicationTools-ExampleV31.package/monticello.meta/version
diff --git a/repository/GsApplicationTools-Server.package/GemServer.class/instance/isRunning.st b/repository/GsApplicationTools-Server.package/GemServer.class/instance/isRunning.st
@@ -1,3 +1,3 @@
 server specialization
 isRunning
-	^self serverClass isRunning
+	^self serverClass isRunning
diff --git a/repository/GsApplicationTools-Server.package/GemServer.class/instance/name.st b/repository/GsApplicationTools-Server.package/GemServer.class/instance/name.st
@@ -2,4 +2,4 @@ accessing
 name
 
 	name == nil ifTrue: [ ^self serverClass name ].
-	^name
+	^name
diff --git a/repository/GsApplicationTools-Server.package/GemServer.class/instance/startGems.st b/repository/GsApplicationTools-Server.package/GemServer.class/instance/startGems.st
@@ -1,8 +1,11 @@
 service instance-control
 startGems
-  self initCrashLog.
-  System commitTransaction
-    ifFalse: [ self error: 'Commit transaction failed before startGems' ].
+  self doCommitTransaction
+    ifFalse: [ 
+      | conflicts |
+      conflicts := System transactionConflicts.
+      self doAbortTransaction.
+      self error: 'Commit transaction failed before startGems' ].
   self logControlEvent: 'Start Gems: ' , self name.
   self portOrResourceNameList
     do: [ :portOrResourceName | 

diff --git a/repository/GsApplicationTools-Server.package/GemServer.class/methodProperties.json b/repository/GsApplicationTools-Server.package/GemServer.class/methodProperties.json
@@ -118,7 +118,7 @@
 		"stackReportLimit" : "dkh 12/30/2014 06:46",
 		"start" : "dkh 01/09/2015 14:16",
 		"startBasicServerOn:" : "dkh 01/06/2015 15:53",
-		"startGems" : "dkh 01/06/2015 15:29",
+		"startGems" : "dkh 01/15/2015 12:35",
 		"startScriptName" : "dkh 12/04/2014 08:02",
 		"startScriptPath" : "dkh 12/04/2014 08:02",
 		"startServerOn:" : "dkh 01/06/2015 15:49",

diff --git a/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/block..st b/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/block..st
@@ -1,4 +1,4 @@
 accessing
 block: anObject
 
-   block := anObject
+   block := anObject
diff --git a/...tory/GsApplicationTools-Server.package/GemServerLauncher.class/instance/nativeProcess..st b/...tory/GsApplicationTools-Server.package/GemServerLauncher.class/instance/nativeProcess..st
@@ -1,4 +1,4 @@
 accessing
 nativeProcess: anObject
 
-   nativeProcess := anObject
+   nativeProcess := anObject
diff --git a/...itory/GsApplicationTools-Server.package/GemServerLauncher.class/instance/nativeProcess.st b/...itory/GsApplicationTools-Server.package/GemServerLauncher.class/instance/nativeProcess.st
@@ -1,4 +1,4 @@
 accessing
 nativeProcess
 
-   ^nativeProcess
+   ^nativeProcess
diff --git a/...ry/GsApplicationTools-Server.package/GemServerLauncher.class/instance/nativeSemaphore..st b/...ry/GsApplicationTools-Server.package/GemServerLauncher.class/instance/nativeSemaphore..st
@@ -1,4 +1,4 @@
 accessing
 nativeSemaphore: anObject
 
-   nativeSemaphore := anObject
+   nativeSemaphore := anObject
diff --git a/...ry/GsApplicationTools-Server.package/GemServerLauncher.class/instance/portableProcess..st b/...ry/GsApplicationTools-Server.package/GemServerLauncher.class/instance/portableProcess..st
@@ -1,4 +1,4 @@
 accessing
 portableProcess: anObject
 
-   portableProcess := anObject
+   portableProcess := anObject
diff --git a/...ory/GsApplicationTools-Server.package/GemServerLauncher.class/instance/portableProcess.st b/...ory/GsApplicationTools-Server.package/GemServerLauncher.class/instance/portableProcess.st
@@ -1,4 +1,4 @@
 accessing
 portableProcess
 
-   ^portableProcess
+   ^portableProcess
diff --git a/.../GsApplicationTools-Server.package/GemServerLauncher.class/instance/portableSemaphore..st b/.../GsApplicationTools-Server.package/GemServerLauncher.class/instance/portableSemaphore..st
@@ -1,4 +1,4 @@
 accessing
 portableSemaphore: anObject
 
-   portableSemaphore := anObject
+   portableSemaphore := anObject
diff --git a/...sitory/GsApplicationTools-Server.package/GemServerRegistry.class/class/gemServerNamed..st b/...sitory/GsApplicationTools-Server.package/GemServerRegistry.class/class/gemServerNamed..st
@@ -1,3 +1,3 @@
 gem server querying
 gemServerNamed: aString
-	^self singleton serverNamed: aString
+	^self singleton serverNamed: aString
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/gemServerNames.st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/gemServerNames.st
@@ -1,3 +1,3 @@
 gem server querying
 gemServerNames
-	^self singleton names asSortedCollection
+	^self singleton names asSortedCollection
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/new.st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/new.st
@@ -1,3 +1,3 @@
 instance creation
 new
-	^self singleton
+	^self singleton
diff --git a/.../GsApplicationTools-Server.package/GemServerRegistry.class/class/removeGemServerNamed..st b/.../GsApplicationTools-Server.package/GemServerRegistry.class/class/removeGemServerNamed..st
@@ -1,4 +1,4 @@
 registration
 removeGemServerNamed: aName
 	self singleton removeServer: aName
-.
+.
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/serverGems.st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/serverGems.st
@@ -1,3 +1,3 @@
 gem server querying
 serverGems
-	^self singleton servers
+	^self singleton servers
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/serversOnPort..st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/serversOnPort..st
@@ -1,3 +1,3 @@
 gem server querying
 serversOnPort: aPortNumber
-	^self singleton serversOnPort: aPortNumber
+	^self singleton serversOnPort: aPortNumber
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/singleton.st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/singleton.st
@@ -2,4 +2,4 @@ accessing
 singleton
 
 	Singleton isNil ifTrue: [self initSingleton].
-	^Singleton
+	^Singleton
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/addServer..st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/addServer..st
@@ -3,4 +3,4 @@ addServer: aServer
 	(self serverNamed: aServer name) notNil 
 		ifTrue: [^Error error: 'Server with that name already exists!'].
 
-	self servers add: aServer
+	self servers add: aServer
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/names.st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/names.st
@@ -1,4 +1,4 @@
 other
 names
 
-	^self servers collect:[:each | each name].
+	^self servers collect:[:each | each name].
diff --git a/...itory/GsApplicationTools-Server.package/GemServerRegistry.class/instance/removeServer..st b/...itory/GsApplicationTools-Server.package/GemServerRegistry.class/instance/removeServer..st
@@ -2,4 +2,4 @@ other
 removeServer: aName
 	|server|
 	server :=self serverNamed:aName.
-	server == nil ifFalse:[ servers remove: server]
+	server == nil ifFalse:[ servers remove: server]
diff --git a/...itory/GsApplicationTools-Server.package/GemServerRegistry.class/instance/serverClasses.st b/...itory/GsApplicationTools-Server.package/GemServerRegistry.class/instance/serverClasses.st
@@ -1,4 +1,4 @@
 other
 serverClasses
 
-	^self servers collect:[:each | each serverClass].
+	^self servers collect:[:each | each serverClass].
diff --git a/...sitory/GsApplicationTools-Server.package/GemServerRegistry.class/instance/serverNamed..st b/...sitory/GsApplicationTools-Server.package/GemServerRegistry.class/instance/serverNamed..st
@@ -1,3 +1,3 @@
 other
 serverNamed: aString
-	^self servers detect:[:each | each name = aString] ifNone:[nil]
+	^self servers detect:[:each | each name = aString] ifNone:[nil]
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/servers.st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/servers.st
@@ -1,3 +1,3 @@
 other
 servers
-	^servers
+	^servers
diff --git a/...ory/GsApplicationTools-Server.package/GemServerRegistry.class/instance/serversOfClass..st b/...ory/GsApplicationTools-Server.package/GemServerRegistry.class/instance/serversOfClass..st
@@ -1,3 +1,3 @@
 other
 serversOfClass: aClassName
-	^servers select: [:each | each serverClass name = aClassName]
+	^servers select: [:each | each serverClass name = aClassName]
diff --git a/repository/GsApplicationTools-Server.package/monticello.meta/version b/repository/GsApplicationTools-Server.package/monticello.meta/version
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,4 @@ accessing @@
     name
     	name == nil ifTrue: [ ^self serverClass name ].
-    	^name
+    	^name