Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[OSJC 61-66-71] fixing where timeouts are read from #127

Merged
merged 1 commit into from Mar 11, 2014
Merged

[OSJC 61-66-71] fixing where timeouts are read from #127

merged 1 commit into from Mar 11, 2014

Conversation

coreydaley
Copy link
Member

Updated to have a default timeout of 3 minutes, which can be overridden by the system configuration (/etc/openshift/express.conf), which can be overridden by the user configuration (~/.openshift/express.conf), which can be overridden by system properties (-Dexpress.timeout=). Also wrote associated tests to test overriding, and added a couple of more "fakes" that were needed for the tests.

@coreydaley
Copy link
Member Author

[test]

@openshift-bot
Copy link

Java Client Test Results: SUCCESS (https://ci.dev.openshift.redhat.com/jenkins/job/test-openshift-java-client/19/)

@@ -31,6 +31,7 @@
protected static final String KEY_RHLOGIN = "default_rhlogin";
protected static final String KEY_LIBRA_SERVER = "libra_server";
protected static final String KEY_LIBRA_DOMAIN = "libra_domain";
protected static final String OPENSHIFT_TIMEOUT = "express.timeout";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd also stick to the naming scheme used for the other constants "KEY_OPENSHIFT_TIMEOUT"

I'd also stick to "timeout" instead of "express.timeout" to match the keys in the express.conf:

The default timeout for network operations
timeout=

and make sure we're using "express.timeout" in the system properties only (since we want to make sure we're not override by some other program in the same jvm that's possibly using "timeout").

@adietish
Copy link
Member

looks perfect, thanks!
[merge]

@openshift-bot
Copy link

@openshift-bot
Copy link

Evaluated for javaclient up to 4e57326

openshift-bot pushed a commit that referenced this pull request Mar 11, 2014
@openshift-bot openshift-bot merged commit 6b76ae1 into openshift:master Mar 11, 2014
@coreydaley coreydaley deleted the OSJC-61-66-71 branch March 11, 2014 16:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants