Skip to content

Commit 251d99e

Browse files
flaixflaix
authored
Merge pull request #1457 from flaix/fixLogStrings
2 parents 24ab9d6 + 3ffca70 commit 251d99e

10 files changed

+95
-130
lines changed

‎src/main/java/com/gitblit/service/FederationPullService.java

+18-36
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import java.io.FileOutputStream;
77
import java.io.IOException;
88
import java.net.InetAddress;
9-
import java.text.MessageFormat;
109
import java.util.ArrayList;
1110
import java.util.Arrays;
1211
import java.util.Collection;
@@ -99,8 +98,7 @@ public void run() {
9998
FederationPullStatus is = registration.getLowestStatus();
10099
if (is.ordinal() < was.ordinal()) {
101100
// the status for this registration has downgraded
102-
logger.warn("Federation pull status of {0} is now {1}", registration.name,
103-
is.name());
101+
logger.warn("Federation pull status of {} is now {}", registration.name, is.name());
104102
if (registration.notifyOnError) {
105103
String message = "Federation pull of " + registration.name + " @ "
106104
+ registration.url + " is now at " + is.name();
@@ -110,9 +108,7 @@ public void run() {
110108
}
111109
}
112110
} catch (Throwable t) {
113-
logger.error(MessageFormat.format(
114-
"Failed to pull from federated gitblit ({0} @ {1})", registration.name,
115-
registration.url), t);
111+
logger.error("Failed to pull from federated gitblit ({} @ {})", registration.name, registration.url, t);
116112
} finally {
117113
reschedule(registration);
118114
}
@@ -133,9 +129,8 @@ private void pull(FederationModel registration) throws Exception {
133129
// confirm valid characters in server alias
134130
Character c = StringUtils.findInvalidCharacter(registrationFolder);
135131
if (c != null) {
136-
logger.error(MessageFormat
137-
.format("Illegal character ''{0}'' in folder name ''{1}'' of federation registration {2}!",
138-
c, registrationFolder, registration.name));
132+
logger.error("Illegal character '{}' in folder name '{}' of federation registration {}!",
133+
c, registrationFolder, registration.name);
139134
return;
140135
}
141136
File repositoriesFolder = gitblit.getRepositoriesFolder();
@@ -147,9 +142,8 @@ private void pull(FederationModel registration) throws Exception {
147142
String cloneUrl = entry.getKey();
148143
RepositoryModel repository = entry.getValue();
149144
if (!repository.hasCommits) {
150-
logger.warn(MessageFormat.format(
151-
"Skipping federated repository {0} from {1} @ {2}. Repository is EMPTY.",
152-
repository.name, registration.name, registration.url));
145+
logger.warn("Skipping federated repository {} from {} @ {}. Repository is EMPTY.",
146+
repository.name, registration.name, registration.url);
153147
registration.updateStatus(repository, FederationPullStatus.SKIPPED);
154148
continue;
155149
}
@@ -181,7 +175,7 @@ private void pull(FederationModel registration) throws Exception {
181175
Repository existingRepository = gitblit.getRepository(repositoryName);
182176

183177
if (existingRepository == null && gitblit.isCollectingGarbage(repositoryName)) {
184-
logger.warn(MessageFormat.format("Skipping local repository {0}, busy collecting garbage", repositoryName));
178+
logger.warn("Skipping local repository {}, busy collecting garbage", repositoryName);
185179
continue;
186180
}
187181

@@ -196,9 +190,8 @@ private void pull(FederationModel registration) throws Exception {
196190
}
197191
existingRepository.close();
198192
if (!origin.startsWith(registration.url)) {
199-
logger.warn(MessageFormat
200-
.format("Skipping federated repository {0} from {1} @ {2}. Origin does not match, consider EXCLUDING.",
201-
repository.name, registration.name, registration.url));
193+
logger.warn("Skipping federated repository {} from {} @ {}. Origin does not match, consider EXCLUDING.",
194+
repository.name, registration.name, registration.url);
202195
registration.updateStatus(repository, FederationPullStatus.SKIPPED);
203196
continue;
204197
}
@@ -207,8 +200,7 @@ private void pull(FederationModel registration) throws Exception {
207200
// clone/pull this repository
208201
CredentialsProvider credentials = new UsernamePasswordCredentialsProvider(
209202
Constants.FEDERATION_USER, registration.token);
210-
logger.info(MessageFormat.format("Pulling federated repository {0} from {1} @ {2}",
211-
repository.name, registration.name, registration.url));
203+
logger.info("Pulling federated repository {} from {} @ {}", repository.name, registration.name, registration.url);
212204

213205
CloneResult result = JGitUtils.cloneRepository(registrationFolderFile, repository.name,
214206
cloneUrl, registration.bare, credentials);
@@ -220,7 +212,7 @@ private void pull(FederationModel registration) throws Exception {
220212
repository.federationStrategy = FederationStrategy.EXCLUDE;
221213
repository.isFrozen = registration.mirror;
222214
repository.showRemoteBranches = !registration.mirror;
223-
logger.info(MessageFormat.format(" cloning {0}", repository.name));
215+
logger.info(" cloning {}", repository.name);
224216
registration.updateStatus(repository, FederationPullStatus.MIRRORED);
225217
} else {
226218
// fetch and update
@@ -240,8 +232,7 @@ private void pull(FederationModel registration) throws Exception {
240232
String hash = ref.getReferencedObjectId().getName();
241233

242234
JGitUtils.setBranchRef(r, branch, hash);
243-
logger.info(MessageFormat.format(" resetting {0} of {1} to {2}", branch,
244-
repository.name, hash));
235+
logger.info(" resetting {} of {} to {}", branch, repository.name, hash);
245236
}
246237
}
247238

@@ -252,8 +243,7 @@ private void pull(FederationModel registration) throws Exception {
252243
newHead = repository.HEAD;
253244
}
254245
JGitUtils.setHEADtoRef(r, newHead);
255-
logger.info(MessageFormat.format(" resetting HEAD of {0} to {1}",
256-
repository.name, newHead));
246+
logger.info(" resetting HEAD of {} to {}", repository.name, newHead);
257247
registration.updateStatus(repository, FederationPullStatus.MIRRORED);
258248
} else {
259249
// indicate no commits pulled
@@ -401,9 +391,7 @@ private void pull(FederationModel registration) throws Exception {
401391
} catch (ForbiddenException e) {
402392
// ignore forbidden exceptions
403393
} catch (IOException e) {
404-
logger.warn(MessageFormat.format(
405-
"Failed to retrieve USERS from federated gitblit ({0} @ {1})",
406-
registration.name, registration.url), e);
394+
logger.warn("Failed to retrieve USERS from federated gitblit ({} @ {})", registration.name, registration.url, e);
407395
}
408396

409397
try {
@@ -422,9 +410,7 @@ private void pull(FederationModel registration) throws Exception {
422410
} catch (ForbiddenException e) {
423411
// ignore forbidden exceptions
424412
} catch (IOException e) {
425-
logger.warn(MessageFormat.format(
426-
"Failed to retrieve TEAMS from federated gitblit ({0} @ {1})",
427-
registration.name, registration.url), e);
413+
logger.warn("Failed to retrieve TEAMS from federated gitblit ({} @ {})", registration.name, registration.url, e);
428414
}
429415

430416
try {
@@ -441,9 +427,7 @@ private void pull(FederationModel registration) throws Exception {
441427
} catch (ForbiddenException e) {
442428
// ignore forbidden exceptions
443429
} catch (IOException e) {
444-
logger.warn(MessageFormat.format(
445-
"Failed to retrieve SETTINGS from federated gitblit ({0} @ {1})",
446-
registration.name, registration.url), e);
430+
logger.warn("Failed to retrieve SETTINGS from federated gitblit ({} @ {})", registration.name, registration.url, e);
447431
}
448432

449433
try {
@@ -463,9 +447,7 @@ private void pull(FederationModel registration) throws Exception {
463447
} catch (ForbiddenException e) {
464448
// ignore forbidden exceptions
465449
} catch (IOException e) {
466-
logger.warn(MessageFormat.format(
467-
"Failed to retrieve SCRIPTS from federated gitblit ({0} @ {1})",
468-
registration.name, registration.url), e);
450+
logger.warn("Failed to retrieve SCRIPTS from federated gitblit ({} @ {})", registration.name, registration.url, e);
469451
}
470452
}
471453

@@ -487,6 +469,6 @@ private void sendStatusAcknowledgment(FederationModel registration) throws Excep
487469
federationName = addr.getHostName();
488470
}
489471
FederationUtils.acknowledgeStatus(addr.getHostAddress(), registration);
490-
logger.info(MessageFormat.format("Pull status sent to {0}", registration.url));
472+
logger.info("Pull status sent to {}", registration.url);
491473
}
492474
}

‎src/main/java/com/gitblit/service/GarbageCollectorService.java

+8-9
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package com.gitblit.service;
1717

18-
import java.text.MessageFormat;
1918
import java.util.Calendar;
2019
import java.util.Date;
2120
import java.util.Map;
@@ -143,7 +142,7 @@ public void run() {
143142
break;
144143
}
145144
if (isCollectingGarbage(repositoryName)) {
146-
logger.warn(MessageFormat.format("Already collecting garbage from {0}?!?", repositoryName));
145+
logger.warn("Already collecting garbage from {}?!?", repositoryName);
147146
continue;
148147
}
149148
boolean garbageCollected = false;
@@ -153,24 +152,24 @@ public void run() {
153152
model = repositoryManager.getRepositoryModel(repositoryName);
154153
repository = repositoryManager.getRepository(repositoryName);
155154
if (repository == null) {
156-
logger.warn(MessageFormat.format("GCExecutor is missing repository {0}?!?", repositoryName));
155+
logger.warn("GCExecutor is missing repository {}?!?", repositoryName);
157156
continue;
158157
}
159158

160159
if (!repositoryManager.isIdle(repository)) {
161-
logger.debug(MessageFormat.format("GCExecutor is skipping {0} because it is not idle", repositoryName));
160+
logger.debug("GCExecutor is skipping {} because it is not idle", repositoryName);
162161
continue;
163162
}
164163

165164
// By setting the GCStatus to COLLECTING we are
166165
// disabling *all* access to this repository from Gitblit.
167166
// Think of this as a clutch in a manual transmission vehicle.
168167
if (!setGCStatus(repositoryName, GCStatus.COLLECTING)) {
169-
logger.warn(MessageFormat.format("Can not acquire GC lock for {0}, skipping", repositoryName));
168+
logger.warn("Can not acquire GC lock for {}, skipping", repositoryName);
170169
continue;
171170
}
172171

173-
logger.debug(MessageFormat.format("GCExecutor locked idle repository {0}", repositoryName));
172+
logger.debug("GCExecutor locked idle repository {}", repositoryName);
174173

175174
Git git = new Git(repository);
176175
GarbageCollectCommand gc = git.gc();
@@ -196,15 +195,15 @@ public void run() {
196195
boolean hasGarbage = sizeOfLooseObjects > 0;
197196
if (hasGarbage && (hasEnoughGarbage || shouldCollectGarbage)) {
198197
long looseKB = sizeOfLooseObjects/1024L;
199-
logger.info(MessageFormat.format("Collecting {1} KB of loose objects from {0}", repositoryName, looseKB));
198+
logger.info("Collecting {} KB of loose objects from {}", looseKB, repositoryName );
200199

201200
// do the deed
202201
gc.call();
203202

204203
garbageCollected = true;
205204
}
206205
} catch (Exception e) {
207-
logger.error("Error collecting garbage in " + repositoryName, e);
206+
logger.error("Error collecting garbage in {}", repositoryName, e);
208207
} finally {
209208
// cleanup
210209
if (repository != null) {
@@ -219,7 +218,7 @@ public void run() {
219218

220219
// reset the GC lock
221220
releaseLock(repositoryName);
222-
logger.debug(MessageFormat.format("GCExecutor released GC lock for {0}", repositoryName));
221+
logger.debug("GCExecutor released GC lock for {}", repositoryName);
223222
}
224223
}
225224

‎src/main/java/com/gitblit/service/LuceneService.java

+18-21
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ public void run() {
172172
Repository repository = repositoryManager.getRepository(model.name);
173173
if (repository == null) {
174174
if (repositoryManager.isCollectingGarbage(model.name)) {
175-
logger.info(MessageFormat.format("Skipping Lucene index of {0}, busy garbage collecting", repositoryName));
175+
logger.info("Skipping Lucene index of {}, busy garbage collecting", repositoryName);
176176
}
177177
continue;
178178
}
@@ -200,9 +200,8 @@ private void index(RepositoryModel model, Repository repository) {
200200

201201
if (result.success) {
202202
if (result.commitCount > 0) {
203-
String msg = "Built {0} Lucene index from {1} commits and {2} files across {3} branches in {4} secs";
204-
logger.info(MessageFormat.format(msg, model.name, result.commitCount,
205-
result.blobCount, result.branchCount, result.duration()));
203+
logger.info("Built {} Lucene index from {} commits and {} files across {} branches in {} secs",
204+
model.name, result.commitCount, result.blobCount, result.branchCount, result.duration());
206205
}
207206
} else {
208207
String msg = "Could not build {0} Lucene index!";
@@ -213,17 +212,15 @@ private void index(RepositoryModel model, Repository repository) {
213212
IndexResult result = updateIndex(model, repository);
214213
if (result.success) {
215214
if (result.commitCount > 0) {
216-
String msg = "Updated {0} Lucene index with {1} commits and {2} files across {3} branches in {4} secs";
217-
logger.info(MessageFormat.format(msg, model.name, result.commitCount,
218-
result.blobCount, result.branchCount, result.duration()));
215+
logger.info("Updated {} Lucene index with {} commits and {} files across {} branches in {} secs",
216+
model.name, result.commitCount, result.blobCount, result.branchCount, result.duration());
219217
}
220218
} else {
221-
String msg = "Could not update {0} Lucene index!";
222-
logger.error(MessageFormat.format(msg, model.name));
219+
logger.error("Could not update {} Lucene index!", model.name);
223220
}
224221
}
225222
} catch (Throwable t) {
226-
logger.error(MessageFormat.format("Lucene indexing failure for {0}", model.name), t);
223+
logger.error("Lucene indexing failure for {}", model.name, t);
227224
}
228225
}
229226

@@ -239,7 +236,7 @@ public synchronized void close(String repositoryName) {
239236
searcher.getIndexReader().close();
240237
}
241238
} catch (Exception e) {
242-
logger.error("Failed to close index searcher for " + repositoryName, e);
239+
logger.error("Failed to close index searcher for {}", repositoryName, e);
243240
}
244241

245242
try {
@@ -248,7 +245,7 @@ public synchronized void close(String repositoryName) {
248245
writer.close();
249246
}
250247
} catch (Exception e) {
251-
logger.error("Failed to close index writer for " + repositoryName, e);
248+
logger.error("Failed to close index writer for {}", repositoryName, e);
252249
}
253250
}
254251

@@ -262,7 +259,7 @@ public synchronized void close() {
262259
try {
263260
writers.get(writer).close();
264261
} catch (Throwable t) {
265-
logger.error("Failed to close Lucene writer for " + writer, t);
262+
logger.error("Failed to close Lucene writer for {}", writer, t);
266263
}
267264
}
268265
writers.clear();
@@ -272,7 +269,7 @@ public synchronized void close() {
272269
try {
273270
searchers.get(searcher).getIndexReader().close();
274271
} catch (Throwable t) {
275-
logger.error("Failed to close Lucene searcher for " + searcher, t);
272+
logger.error("Failed to close Lucene searcher for {}", searcher, t);
276273
}
277274
}
278275
searchers.clear();
@@ -594,7 +591,7 @@ public int compare(RefModel ref1, RefModel ref2) {
594591
resetIndexSearcher(model.name);
595592
result.success();
596593
} catch (Exception e) {
597-
logger.error("Exception while reindexing " + model.name, e);
594+
logger.error("Exception while reindexing {}", model.name, e);
598595
}
599596
return result;
600597
}
@@ -673,7 +670,7 @@ private IndexResult index(String repositoryName, Repository repository,
673670
result.commitCount++;
674671
result.success = index(repositoryName, doc);
675672
} catch (Exception e) {
676-
logger.error(MessageFormat.format("Exception while indexing commit {0} in {1}", commit.getId().getName(), repositoryName), e);
673+
logger.error("Exception while indexing commit {} in {}", commit.getId().getName(), repositoryName, e);
677674
}
678675
return result;
679676
}
@@ -701,10 +698,10 @@ public boolean deleteBlob(String repositoryName, String branch, String path) thr
701698
writer.commit();
702699
int numDocsAfter = writer.numDocs();
703700
if (numDocsBefore == numDocsAfter) {
704-
logger.debug(MessageFormat.format("no records found to delete {0}", query.toString()));
701+
logger.debug("no records found to delete {}", query.toString());
705702
return false;
706703
} else {
707-
logger.debug(MessageFormat.format("deleted {0} records with {1}", numDocsBefore - numDocsAfter, query.toString()));
704+
logger.debug("deleted {} records with {}", numDocsBefore - numDocsAfter, query.toString());
708705
return true;
709706
}
710707
}
@@ -833,7 +830,7 @@ public int compare(RefModel ref1, RefModel ref2) {
833830
}
834831
result.success = true;
835832
} catch (Throwable t) {
836-
logger.error(MessageFormat.format("Exception while updating {0} Lucene index", model.name), t);
833+
logger.error("Exception while updating {} Lucene index", model.name, t);
837834
}
838835
return result;
839836
}
@@ -876,7 +873,7 @@ private boolean index(String repositoryName, Document doc) {
876873
resetIndexSearcher(repositoryName);
877874
return true;
878875
} catch (Exception e) {
879-
logger.error(MessageFormat.format("Exception while incrementally updating {0} Lucene index", repositoryName), e);
876+
logger.error("Exception while incrementally updating {} Lucene index", repositoryName, e);
880877
}
881878
return false;
882879
}
@@ -1049,7 +1046,7 @@ public List<SearchResult> search(String text, int page, int pageSize, String...
10491046
results.add(result);
10501047
}
10511048
} catch (Exception e) {
1052-
logger.error(MessageFormat.format("Exception while searching for {0}", text), e);
1049+
logger.error("Exception while searching for {}", text, e);
10531050
}
10541051
return new ArrayList<SearchResult>(results);
10551052
}

‎src/main/java/com/gitblit/service/MirrorService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public void run() {
119119

120120
repository = repositoryManager.getRepository(repositoryName);
121121
if (repository == null) {
122-
logger.warn(MessageFormat.format("MirrorExecutor is missing repository {0}?!?", repositoryName));
122+
logger.warn("MirrorExecutor is missing repository {}?!?", repositoryName);
123123
continue;
124124
}
125125

@@ -204,7 +204,7 @@ public void run() {
204204
}
205205
}
206206
} catch (Exception e) {
207-
logger.error("Error updating mirror " + repositoryName, e);
207+
logger.error("Error updating mirror {}", repositoryName, e);
208208
} finally {
209209
// cleanup
210210
if (repository != null) {

0 commit comments

Comments
 (0)