Skip to content

Commit 4b663d4

Browse files
committed
1480: add trace logger
1 parent 2e58bd8 commit 4b663d4

File tree

1 file changed

+18
-17
lines changed

1 file changed

+18
-17
lines changed

lib/src/main/java/com/diffplug/spotless/npm/NpmFormatterStepStateBase.java

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,16 @@
3434
import com.diffplug.spotless.FormatterFunc;
3535
import com.diffplug.spotless.ProcessRunner.LongRunningProcess;
3636
import com.diffplug.spotless.ThrowingEx;
37+
import com.diffplug.spotless.TimedLogger;
3738

3839
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
3940

4041
abstract class NpmFormatterStepStateBase implements Serializable {
4142

4243
private static final Logger logger = LoggerFactory.getLogger(NpmFormatterStepStateBase.class);
4344

45+
private static final TimedLogger timedLogger = TimedLogger.forLogger(logger);
46+
4447
private static final long serialVersionUID = 1460749955865959948L;
4548

4649
@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
@@ -61,26 +64,24 @@ protected NpmFormatterStepStateBase(String stepName, NpmConfig npmConfig, NpmFor
6164

6265
protected void prepareNodeServerLayout() throws IOException {
6366
final long started = System.currentTimeMillis();
64-
// maybe introduce trace logger?
65-
logger.info("Preparing {} for npm step {}.", this.nodeServerLayout, getClass().getName());
66-
NpmResourceHelper.assertDirectoryExists(nodeServerLayout.nodeModulesDir());
67-
NpmResourceHelper.writeUtf8StringToFile(nodeServerLayout.packageJsonFile(),
68-
this.npmConfig.getPackageJsonContent());
69-
NpmResourceHelper
70-
.writeUtf8StringToFile(nodeServerLayout.serveJsFile(), this.npmConfig.getServeScriptContent());
71-
if (this.npmConfig.getNpmrcContent() != null) {
72-
NpmResourceHelper.writeUtf8StringToFile(nodeServerLayout.npmrcFile(), this.npmConfig.getNpmrcContent());
73-
} else {
74-
NpmResourceHelper.deleteFileIfExists(nodeServerLayout.npmrcFile());
75-
}
76-
logger.info("Prepared {} for npm step {} in {} ms.", this.nodeServerLayout, getClass().getName(), System.currentTimeMillis() - started);
67+
68+
timedLogger.withInfo("Preparing {} for npm step {}.", this.nodeServerLayout, getClass().getName()).run(() -> {
69+
NpmResourceHelper.assertDirectoryExists(nodeServerLayout.nodeModulesDir());
70+
NpmResourceHelper.writeUtf8StringToFile(nodeServerLayout.packageJsonFile(),
71+
this.npmConfig.getPackageJsonContent());
72+
NpmResourceHelper
73+
.writeUtf8StringToFile(nodeServerLayout.serveJsFile(), this.npmConfig.getServeScriptContent());
74+
if (this.npmConfig.getNpmrcContent() != null) {
75+
NpmResourceHelper.writeUtf8StringToFile(nodeServerLayout.npmrcFile(), this.npmConfig.getNpmrcContent());
76+
} else {
77+
NpmResourceHelper.deleteFileIfExists(nodeServerLayout.npmrcFile());
78+
}
79+
});
7780
}
7881

7982
protected void prepareNodeServer() throws IOException {
80-
final long started = System.currentTimeMillis();
81-
logger.info("running npm install in {} for npm step {}", this.nodeServerLayout.nodeModulesDir(), getClass().getName());
82-
runNpmInstall(nodeServerLayout.nodeModulesDir());
83-
logger.info("npm install finished in {} ms in {} for npm step {}", System.currentTimeMillis() - started, this.nodeServerLayout.nodeModulesDir(), getClass().getName());
83+
timedLogger.withInfo("Running npm install in {} for npm step {}.", this.nodeServerLayout.nodeModulesDir(), getClass().getName())
84+
.run(() -> runNpmInstall(nodeServerLayout.nodeModulesDir()));
8485
}
8586

8687
private void runNpmInstall(File npmProjectDir) throws IOException {

0 commit comments

Comments
 (0)