mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 22:52:11 +02:00
Code Issues Wiki Activity

[226237] [dstore] Move the place where the ServerLogger instance is made

Browse source
This commit is contained in:
David McKnight 2008-04-09 14:08:29 +00:00
parent 7be39dbed3
commit dbbcf58643
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java
View file

@ -19,6 +19,7 @@
* Jacob Garcowski (IBM) [225175] [dstore] error handling change for Client
* David McKnight (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types
* Noriaki Takatsu (IBM) - [226074] process for getStatus() API
* Noriaki Takatsu (IBM) - [226237] [dstore] Move the place where the ServerLogger instance is made
*******************************************************************************/
package org.eclipse.dstore.core.server;
@ -43,6 +44,7 @@ import org.eclipse.dstore.core.model.DataElement;
import org.eclipse.dstore.core.model.DataStore;
import org.eclipse.dstore.core.model.DataStoreAttributes;
import org.eclipse.dstore.core.model.ISSLProperties;
import org.eclipse.dstore.core.model.Client;
import org.eclipse.dstore.internal.core.server.ServerAttributes;
import org.eclipse.dstore.internal.core.server.ServerCommandHandler;
import org.eclipse.dstore.internal.core.server.ServerReturnCodes;
@ -390,6 +392,14 @@ public class ConnectionEstablisher
_updateHandler.setDataStore(_dataStore);
_commandHandler.setDataStore(_dataStore);
if (SystemServiceManager.getInstance().getSystemService() == null)
{
Client client = new Client();
_dataStore.setClient(client);
ServerLogger logger = new ServerLogger(_dataStore.getUserPreferencesDirectory());
client.setLogger(logger);
}
_receivers = new ArrayList();
_continue = true;

14
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/EnvironmentMiner.java
View file

@ -16,6 +16,7 @@
* David McKnight (IBM) - [196624] dstore miner IDs should be String constants rather than dynamic lookup
* Noriaki Takatsu (IBM) - [220126] [dstore][api][breaking] Single process server for multiple clients
* David McKnight (IBM) [224906] [dstore] changes for getting properties and doing exit due to single-process capability
* Noriaki Takatsu (IBM) - [226237] [dstore] Move the place where the ServerLogger instance is made
*******************************************************************************/
package org.eclipse.rse.dstore.universal.miners;
@ -60,19 +61,6 @@ public class EnvironmentMiner extends Miner
public void extendSchema(DataElement schemaRoot)
{
if (_dataStore.getClient() != null)
{
ServerLogger logger = new ServerLogger(UniversalServerUtilities.getUserPreferencesDirectory(_dataStore));
_dataStore.getClient().setLogger(logger);
}
else
{
Client client = new Client();
_dataStore.setClient(client);
ServerLogger logger = new ServerLogger(UniversalServerUtilities.getUserPreferencesDirectory(_dataStore));
client.setLogger(logger);
}
DataElement envVar = _dataStore.createObjectDescriptor(schemaRoot, "Environment Variable"); //$NON-NLS-1$
_dataStore.createReference(envVar, _dataStore.createRelationDescriptor(schemaRoot,"Parent Environment")); //$NON-NLS-1$
DataElement containerObjectD = _dataStore.findObjectDescriptor("Container Object"); //$NON-NLS-1$