Skip to content

Commit

Permalink
Case-insensitive env-based configuration of uniform output.
Browse files Browse the repository at this point in the history
  • Loading branch information
nmihajlovski committed Sep 28, 2016
1 parent 454fa0c commit 0669705
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 9 deletions.
Expand Up @@ -5,6 +5,7 @@
import org.rapidoid.annotation.Since; import org.rapidoid.annotation.Since;
import org.rapidoid.config.RapidoidInitializer; import org.rapidoid.config.RapidoidInitializer;
import org.rapidoid.u.U; import org.rapidoid.u.U;
import org.rapidoid.util.GlobalCfg;
import org.rapidoid.util.Msc; import org.rapidoid.util.Msc;


import java.io.IOException; import java.io.IOException;
Expand Down Expand Up @@ -67,7 +68,7 @@ public static List<String> notes() {
List<String> notes = U.list(); List<String> notes = U.list();


if (Msc.dockerized()) notes.add("Dockerized"); if (Msc.dockerized()) notes.add("Dockerized");
if (Msc.uniformOutput()) notes.add("Uniform output"); if (GlobalCfg.uniformOutput()) notes.add("Uniform output");


return notes; return notes;
} }
Expand Down
38 changes: 38 additions & 0 deletions rapidoid-commons/src/main/java/org/rapidoid/util/GlobalCfg.java
@@ -0,0 +1,38 @@
package org.rapidoid.util;

import org.rapidoid.RapidoidThing;
import org.rapidoid.annotation.Authors;
import org.rapidoid.annotation.Since;

/*
* #%L
* rapidoid-commons
* %%
* Copyright (C) 2014 - 2016 Nikolche Mihajlovski and contributors
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* #L%
*/

@Authors("Nikolche Mihajlovski")
@Since("5.2.5")
public class GlobalCfg extends RapidoidThing {

private static final boolean uniformOutput = "true".equalsIgnoreCase(System.getenv("UNIFORM_OUTPUT"))
|| "true".equalsIgnoreCase(System.getenv("uniform_output"));

public static boolean uniformOutput() {
return uniformOutput;
}

}
8 changes: 1 addition & 7 deletions rapidoid-commons/src/main/java/org/rapidoid/util/Msc.java
Expand Up @@ -76,8 +76,6 @@ public class Msc extends RapidoidThing implements Constants {


public static final String OS_NAME = System.getProperty("os.name"); public static final String OS_NAME = System.getProperty("os.name");


private static final boolean uniformOutput = "true".equalsIgnoreCase(System.getenv("UNIFORM_OUTPUT"));

private static volatile String uid; private static volatile String uid;


private static volatile long measureStart; private static volatile long measureStart;
Expand Down Expand Up @@ -1062,12 +1060,8 @@ private static boolean hasAppFolder() {
return app.exists() && app.isDirectory(); return app.exists() && app.isDirectory();
} }


public static boolean uniformOutput() {
return uniformOutput;
}

public static Object maybeMasked(Object value) { public static Object maybeMasked(Object value) {
return uniformOutput ? "<?>" : value; return GlobalCfg.uniformOutput() ? "<?>" : value;
} }


public static synchronized String id() { public static synchronized String id() {
Expand Down
1 change: 1 addition & 0 deletions rapidoid-commons/src/main/resources/rapidoid-classes.txt
Expand Up @@ -644,6 +644,7 @@ org.rapidoid.util.D
org.rapidoid.util.Deleted org.rapidoid.util.Deleted
org.rapidoid.util.ErrCodeAndMsg org.rapidoid.util.ErrCodeAndMsg
org.rapidoid.util.Expectation org.rapidoid.util.Expectation
org.rapidoid.util.GlobalCfg
org.rapidoid.util.LazyInit org.rapidoid.util.LazyInit
org.rapidoid.util.Lorem org.rapidoid.util.Lorem
org.rapidoid.util.MapEntry org.rapidoid.util.MapEntry
Expand Down
Expand Up @@ -20,6 +20,7 @@
import org.rapidoid.net.abstracts.Channel; import org.rapidoid.net.abstracts.Channel;
import org.rapidoid.u.U; import org.rapidoid.u.U;
import org.rapidoid.util.Constants; import org.rapidoid.util.Constants;
import org.rapidoid.util.GlobalCfg;
import org.rapidoid.util.Msc; import org.rapidoid.util.Msc;
import org.rapidoid.util.StreamUtils; import org.rapidoid.util.StreamUtils;


Expand Down Expand Up @@ -125,7 +126,7 @@ public static void addDefaultHeaders(Channel ctx, boolean isKeepAlive, MediaType
if (MANDATORY_HEADER_DATE) { if (MANDATORY_HEADER_DATE) {
ctx.write(DATE_IS); ctx.write(DATE_IS);


if (!Msc.uniformOutput()) { if (!GlobalCfg.uniformOutput()) {
ctx.write(Dates.getDateTimeBytes()); ctx.write(Dates.getDateTimeBytes());
} else { } else {
ctx.write(UNIFORM_DATE); ctx.write(UNIFORM_DATE);
Expand Down

0 comments on commit 0669705

Please sign in to comment.