Skip to content

Commit

Permalink
Merge pull request #23 from GsDevKit/dev
Browse files Browse the repository at this point in the history 
Issue #22: if GEMSTONE_LOG_DIR not defined use /opt/gemstone/log for Gem...
  • Loading branch information
@dalehenrich
dalehenrich committed Jan 27, 2015
2 parents 9320fab + 5721e4a commit 577953c
Show file tree
Hide file tree
Showing 26 changed files with 29 additions and 27 deletions.
6 changes: 4 additions & 2 deletions repository/GsApplicationTools-Server.package/GemServer.class/instance/gemPidFileName..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@ service instance-private
gemPidFileName: portOrResourceName
"must match bin/stopGemServerGem script"

^ (GsFile _expandEnvVariable: 'GEMSTONE_LOGDIR' isClient: false) , '/'
, self name , '_server-' , portOrResourceName asString , '.pid'
| logDir |
logDir := (GsFile _expandEnvVariable: 'GEMSTONE_LOGDIR' isClient: false)
ifNil: [ '/opt/gemstone/log' ].
^ logDir , '/' , self name , '_server-' , portOrResourceName asString , '.pid'
2 changes: 1 addition & 1 deletion repository/GsApplicationTools-Server.package/GemServer.class/instance/isRunning.st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
server specialization
isRunning
^self serverClass isRunning
^self serverClass isRunning
2 changes: 1 addition & 1 deletion repository/GsApplicationTools-Server.package/GemServer.class/instance/name.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ accessing
name

name == nil ifTrue: [ ^self serverClass name ].
^name
^name
2 changes: 1 addition & 1 deletion repository/GsApplicationTools-Server.package/GemServer.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"executeStartGemCommand:" : "dkh 01/06/2015 15:31",
"executeStatusGemCommand:" : "dkh 12/20/2014 21:46",
"executeStopGemCommand:" : "dkh 01/06/2015 15:30",
"gemPidFileName:" : "dkh 01/06/2015 15:29",
"gemPidFileName:" : "dkh 01/26/2015 15:07",
"gemServer:" : "dkh 12/30/2014 16:10",
"gemServer:beforeUnwind:" : "dkh 12/30/2014 16:11",
"gemServer:beforeUnwind:ensure:" : "dkh 12/30/2014 16:11",
Expand Down
2 changes: 1 addition & 1 deletion repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/block..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
block: anObject

block := anObject
block := anObject
2 changes: 1 addition & 1 deletion ...tory/GsApplicationTools-Server.package/GemServerLauncher.class/instance/nativeProcess..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
nativeProcess: anObject

nativeProcess := anObject
nativeProcess := anObject
2 changes: 1 addition & 1 deletion ...itory/GsApplicationTools-Server.package/GemServerLauncher.class/instance/nativeProcess.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
nativeProcess

^nativeProcess
^nativeProcess
2 changes: 1 addition & 1 deletion ...ry/GsApplicationTools-Server.package/GemServerLauncher.class/instance/nativeSemaphore..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
nativeSemaphore: anObject

nativeSemaphore := anObject
nativeSemaphore := anObject
2 changes: 1 addition & 1 deletion ...ry/GsApplicationTools-Server.package/GemServerLauncher.class/instance/portableProcess..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
portableProcess: anObject

portableProcess := anObject
portableProcess := anObject
2 changes: 1 addition & 1 deletion ...ory/GsApplicationTools-Server.package/GemServerLauncher.class/instance/portableProcess.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
portableProcess

^portableProcess
^portableProcess
2 changes: 1 addition & 1 deletion .../GsApplicationTools-Server.package/GemServerLauncher.class/instance/portableSemaphore..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
portableSemaphore: anObject

portableSemaphore := anObject
portableSemaphore := anObject
2 changes: 1 addition & 1 deletion ...sitory/GsApplicationTools-Server.package/GemServerRegistry.class/class/gemServerNamed..st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
gem server querying
gemServerNamed: aString
^self singleton serverNamed: aString
^self singleton serverNamed: aString
2 changes: 1 addition & 1 deletion repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/gemServerNames.st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
gem server querying
gemServerNames
^self singleton names asSortedCollection
^self singleton names asSortedCollection
2 changes: 1 addition & 1 deletion repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/new.st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
instance creation
new
^self singleton
^self singleton
2 changes: 1 addition & 1 deletion .../GsApplicationTools-Server.package/GemServerRegistry.class/class/removeGemServerNamed..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
registration
removeGemServerNamed: aName
self singleton removeServer: aName
.
.
2 changes: 1 addition & 1 deletion repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/serverGems.st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
gem server querying
serverGems
^self singleton servers
^self singleton servers
2 changes: 1 addition & 1 deletion repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/serversOnPort..st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
gem server querying
serversOnPort: aPortNumber
^self singleton serversOnPort: aPortNumber
^self singleton serversOnPort: aPortNumber
2 changes: 1 addition & 1 deletion repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/singleton.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ accessing
singleton

Singleton isNil ifTrue: [self initSingleton].
^Singleton
^Singleton
2 changes: 1 addition & 1 deletion repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/addServer..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/names.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
other
names

^self servers collect:[:each | each name].
^self servers collect:[:each | each name].
2 changes: 1 addition & 1 deletion ...itory/GsApplicationTools-Server.package/GemServerRegistry.class/instance/removeServer..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ other
removeServer: aName
|server|
server :=self serverNamed:aName.
server == nil ifFalse:[ servers remove: server]
server == nil ifFalse:[ servers remove: server]
2 changes: 1 addition & 1 deletion ...itory/GsApplicationTools-Server.package/GemServerRegistry.class/instance/serverClasses.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
other
serverClasses

^self servers collect:[:each | each serverClass].
^self servers collect:[:each | each serverClass].
2 changes: 1 addition & 1 deletion ...sitory/GsApplicationTools-Server.package/GemServerRegistry.class/instance/serverNamed..st
View file
Original file line number Diff line number Diff line change
@@ -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]
2 changes: 1 addition & 1 deletion repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/servers.st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
other
servers
^servers
^servers
2 changes: 1 addition & 1 deletion ...ory/GsApplicationTools-Server.package/GemServerRegistry.class/instance/serversOfClass..st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
other
serversOfClass: aClassName
^servers select: [:each | each serverClass name = aClassName]
^servers select: [:each | each serverClass name = aClassName]
2 changes: 1 addition & 1 deletion repository/GsApplicationTools-Server.package/monticello.meta/version
View file

Large diffs are not rendered by default.

0 comments on commit 577953c

Please sign in to comment.