34
34
import com .diffplug .spotless .FormatterFunc ;
35
35
import com .diffplug .spotless .ProcessRunner .LongRunningProcess ;
36
36
import com .diffplug .spotless .ThrowingEx ;
37
+ import com .diffplug .spotless .TimedLogger ;
37
38
38
39
import edu .umd .cs .findbugs .annotations .SuppressFBWarnings ;
39
40
40
41
abstract class NpmFormatterStepStateBase implements Serializable {
41
42
42
43
private static final Logger logger = LoggerFactory .getLogger (NpmFormatterStepStateBase .class );
43
44
45
+ private static final TimedLogger timedLogger = TimedLogger .forLogger (logger );
46
+
44
47
private static final long serialVersionUID = 1460749955865959948L ;
45
48
46
49
@ SuppressFBWarnings ("SE_TRANSIENT_FIELD_NOT_RESTORED" )
@@ -61,26 +64,24 @@ protected NpmFormatterStepStateBase(String stepName, NpmConfig npmConfig, NpmFor
61
64
62
65
protected void prepareNodeServerLayout () throws IOException {
63
66
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
+ } );
77
80
}
78
81
79
82
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 ()));
84
85
}
85
86
86
87
private void runNpmInstall (File npmProjectDir ) throws IOException {
0 commit comments