Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Bruce Downs committed Oct 26, 2017
2 parents 8e8accb + b94fde1 commit 6e53fc5
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 13 deletions.
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.jivesoftware.os.mlogger.inheritance.poms</groupId>
<artifactId>global-build-management</artifactId>
<version>0.27</version>
<version>0.28</version>
<relativePath>../inheritance-poms/global-build-management/pom.xml</relativePath>
</parent>
<groupId>com.jivesoftware.os.mlogger</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,7 @@ static public MetricLogger getLogger(Class _class, boolean logsExternalInteracti
static public MetricLogger getLogger(String name, boolean logsExternalInteractions) {
MetricLogger got = serviceLoggers.get(name);
if (got != null) {
got.debug("ServiceFactory is being called more that once for the same class:" + name);
StackTraceElement[] elements = Thread.currentThread().getStackTrace();
for (int i = 0; i < elements.length; i++) {
got.debug(i + " " + elements[i].getClassName());
}
got.warn("ServiceFactory is being called more that once for the same class:" + name);
return got;
}
LoggerSummary loggerSummary = (logsExternalInteractions) ? LoggerSummary.INSTANCE_EXTERNAL_INTERACTIONS : LoggerSummary.INSTANCE;
Expand Down
4 changes: 2 additions & 2 deletions inheritance-poms/global-build-management/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<parent>
<groupId>com.jivesoftware.os.mlogger.inheritance.poms</groupId>
<artifactId>global-repo-management</artifactId>
<version>0.27</version>
<version>0.28</version>
<relativePath>../global-repo-management/pom.xml</relativePath>
</parent>
<groupId>com.jivesoftware.os.mlogger.inheritance.poms</groupId>
<artifactId>global-build-management</artifactId>
<version>0.27</version>
<version>0.28</version>
<packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
2 changes: 1 addition & 1 deletion inheritance-poms/global-repo-management/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.jivesoftware.os.mlogger.inheritance.poms</groupId>
<artifactId>global-repo-management</artifactId>
<version>0.27</version>
<version>0.28</version>
<packaging>pom</packaging>

<name>MLogger</name>
Expand Down
4 changes: 2 additions & 2 deletions inheritance-poms/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.jivesoftware.os.mlogger</groupId>
<artifactId>inheritance-poms</artifactId>
<version>0.27</version>
<version>0.28</version>
<packaging>pom</packaging>
<parent>
<groupId>com.jivesoftware.os.mlogger.inheritance.poms</groupId>
<artifactId>global-repo-management</artifactId>
<version>0.27</version>
<version>0.28</version>
<relativePath>../inheritance-poms/global-repo-management/pom.xml</relativePath>
</parent>
<modules>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.jivesoftware.os.jive</groupId>
<artifactId>mlogger</artifactId>
<version>0.27</version>
<version>0.28</version>
<packaging>pom</packaging>
<parent>
<groupId>com.jivesoftware.os.mlogger.inheritance.poms</groupId>
<artifactId>global-repo-management</artifactId>
<version>0.27</version>
<version>0.28</version>
<relativePath>inheritance-poms/global-repo-management/pom.xml</relativePath>
</parent>
<modules>
Expand Down

0 comments on commit 6e53fc5

Please sign in to comment.