Skip to content

Commit 0fac7bf

Browse files
committed
Merge pull request #338 from ThomasJClark/nt
Fix StringIndexOutOfBoundsException in NetworkTables logger
2 parents 58f053c + cc8d58a commit 0fac7bf

File tree

1 file changed

+4
-3
lines changed
  • core/src/main/java/edu/wpi/grip/core/operations/networktables

1 file changed

+4
-3
lines changed

core/src/main/java/edu/wpi/grip/core/operations/networktables/NTManager.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
import com.google.inject.Singleton;
55
import edu.wpi.first.wpilibj.networktables.NetworkTable;
66
import edu.wpi.first.wpilibj.networktables.NetworkTablesJNI;
7-
import edu.wpi.grip.core.settings.ProjectSettings;
87
import edu.wpi.grip.core.events.ProjectSettingsChangedEvent;
8+
import edu.wpi.grip.core.settings.ProjectSettings;
99

1010
import javax.inject.Inject;
11+
import java.io.File;
1112
import java.util.HashMap;
1213
import java.util.Map;
1314
import java.util.logging.Level;
@@ -43,8 +44,8 @@ public NTManager(Logger logger) {
4344
// Redirect NetworkTables log messages to our own log files. This gets rid of console spam, and it also lets
4445
// us grep through NetworkTables messages just like any other messages.
4546
NetworkTablesJNI.setLogger((level, file, line, msg) -> {
46-
String fileName = "ntcore/" + file.substring(file.indexOf("src/"));
47-
logger.log(ntLogLevels.get(level), String.format("%s:%d %s", fileName, line, msg));
47+
String filename = new File(file).getName();
48+
logger.log(ntLogLevels.get(level), String.format("NetworkTables: %s:%d %s", filename, line, msg));
4849
}, 0);
4950

5051
NetworkTable.setClientMode();

0 commit comments

Comments
 (0)