Skip to content

Commit 473884b

Browse files
committed
remove excessive logging, issue turns out not to be a threadsafety issue - logger added to avoid similar problems
1 parent e042bf3 commit 473884b

1 file changed

Lines changed: 11 additions & 32 deletions

File tree

src/main/java/picoded/dstack/stack/ProviderConfig.java

Lines changed: 11 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.util.Map;
66
import java.util.concurrent.ConcurrentHashMap;
77

8+
import io.vertx.core.impl.logging.Logger;
89
import picoded.core.conv.ConvertJSON;
910
import picoded.core.struct.GenericConvertHashMap;
1011
import picoded.core.struct.GenericConvertList;
@@ -48,16 +49,15 @@ public class ProviderConfig {
4849
//
4950
//--------------------------------------------------------------------------
5051

52+
// Logger to use, for config file warnings
53+
private static final Logger LOGGER = Logger.getLogger(ProviderConfig.class.getName());
54+
5155
/**
5256
* Load the provider config with provider list
5357
**/
5458
public ProviderConfig(List<Object> inConfigList) {
55-
System.out.println("!! Setting up ProviderConfig");
56-
57-
// The variables are intentionally initialized here inside the constructor
5859
providerConfigMap = new HashMap<>();
5960
providerStackMap = new ConcurrentHashMap<>();
60-
6161
loadConfigArray(inConfigList);
6262
}
6363

@@ -134,62 +134,41 @@ protected GenericConvertMap<String, Object> getStackConfig(String name) {
134134
* @return the stack provider if found
135135
*/
136136
public CoreStack getProviderStack(String name) {
137-
System.out.println("!! GET getProviderStack : "+name);
138-
139137
// Get and return from cache if found
140138
CoreStack cache = providerStackMap.get(name);
141139
if (cache != null) {
142-
System.out.println("!! CACHE HIT 1 getProviderStack : "+name);
143140
return cache;
144141
}
145142

146143
synchronized (this) {
147-
System.out.println("!! THREAD LOCK getProviderStack : "+name);
148144
// Check the cache again (avoid race condition)
149145
cache = providerStackMap.get(name);
150146
if (cache != null) {
151-
System.out.println("!! CACHE HIT 2 getProviderStack : "+name);
152147
return cache;
153148
}
154149

150+
// Log the setup
151+
String type = providerConfig.getString("type");
152+
LOGGER.info("Setting DStack provider backend : "+name+" ("+type+")");
153+
155154
// Cache not found, get config to initialize a new stack
156155
GenericConvertMap<String, Object> providerConfig = getStackConfig(name);
157156
if (providerConfig == null) {
158157
throw new IllegalArgumentException("Unknown provider name, config not found : " + name);
159158
}
160159

161-
// Logging for debugging issue
162-
System.out.println("!! Initializing getProviderStack : "+name);
163-
System.out.println("!! providerStackMap ptr : "+providerStackMap);
164-
165160
// Initialization of stack and store into cache
166161
try {
167-
cache = initStack(providerConfig.getString("type"), providerConfig);
162+
cache = initStack(type, providerConfig);
168163
} catch(Exception e) {
169-
System.err.println(e.getMessage());
170-
System.err.println(e.getStackTrace());
164+
// Log the error, as this is easily missed into an API error
165+
LOGGER.error("Error while setting DStack provider : "+name+" ("+type+")", e);
171166
throw new RuntimeException(e);
172167
}
173168

174-
// Null safety check
175-
if( cache == null ) {
176-
System.out.println("!! initialized stack is null : "+name);
177-
throw new RuntimeException("Unexpected NULL provider stack was initialized");
178-
}
179-
180-
181169
// Save it into cache
182170
providerStackMap.put(name, cache);
183171

184-
// Lets do a GET validation, I dunno why im doing this
185-
if( providerStackMap.get(name) != cache ) {
186-
System.out.println("!! Failed GET after PUT : "+name);
187-
throw new RuntimeException("Failed GET after PUT safety test");
188-
}
189-
190-
// Logically this should only happen ONCE !
191-
System.out.println("!! Returning Initialized getProviderStack : "+name);
192-
193172
// Return result
194173
return cache;
195174
}

0 commit comments

Comments
 (0)