Skip to content

Commit dd62b81

Browse files
committed
added extra scanning debug
1 parent 4b7cb9a commit dd62b81

File tree

4 files changed

+20
-3
lines changed

4 files changed

+20
-3
lines changed

.github/workflows/release.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,12 +133,20 @@ jobs:
133133
wfps=$(fgrep 'file=' fingers-${{ matrix.os }}.wfp | wc -l)
134134
echo "Found ${wfps} in src."
135135
136-
- name: Cache ${{ matrix.os }} Binary
136+
- name: Cache ${{ matrix.os }} Binary Unix
137+
if: runner.os != 'Windows'
137138
uses: actions/upload-artifact@v3
138139
with:
139140
name: scanoss-jars
140141
path: ./target/scanoss-java-${{ matrix.os }}
141142

143+
- name: Cache ${{ matrix.os }} Binary Windows
144+
if: runner.os == 'Windows'
145+
uses: actions/upload-artifact@v3
146+
with:
147+
name: scanoss-jars
148+
path: ./target/scanoss-java-${{ matrix.os }}.exe
149+
142150

143151
# Upload all the jars and binaries a GH Release
144152
create_release:

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
- Upcoming changes...
1313

14+
## [0.5.4] - 2023-10-23
15+
### Added
16+
- Added extra debug information to scanning
17+
1418
## [0.5.3] - 2023-10-03
1519
### Added
1620
- Added symbolic file check (to skip)
@@ -53,3 +57,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
5357
[0.5.1]: https://github.com/scanoss/scanoss.java/compare/v0.5.0...v0.5.1
5458
[0.5.2]: https://github.com/scanoss/scanoss.java/compare/v0.5.1...v0.5.2
5559
[0.5.3]: https://github.com/scanoss/scanoss.java/compare/v0.5.2...v0.5.3
60+
[0.5.4]: https://github.com/scanoss/scanoss.java/compare/v0.5.3...v0.5.4

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.scanoss</groupId>
88
<artifactId>scanoss</artifactId>
9-
<version>0.5.3</version>
9+
<version>0.5.4</version>
1010
<packaging>jar</packaging>
1111
<name>scanoss.java</name>
1212
<url>https://github.com/scanoss/scanoss.java</url>

src/main/java/com/scanoss/Scanner.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,7 @@ public List<String> processFileList(@NonNull String root, @NonNull List<String>
316316
Path fullPath = Path.of(root, file);
317317
File f = fullPath.toFile();
318318
if (f.exists() && f.isFile() && f.length() > 0 && ! Files.isSymbolicLink(fullPath)) {
319+
log.debug("Adding file to processing list: {}", file);
319320
Future<String> future = executorService.submit(() -> processor.process(file, stripDirectory(root, file)));
320321
futures.add(future);
321322
}
@@ -341,7 +342,10 @@ private List<String> processFutures(@NonNull List<Future<String>> futures) throw
341342
log.warn("something went wrong processing result: {}", future);
342343
}
343344
} catch (InterruptedException | ExecutionException e) {
344-
throw new ScannerException("Folder processing subtask failed", e);
345+
if (log.isDebugEnabled()) {
346+
log.error("Issue encountered processing subtask futures: {}", e.getLocalizedMessage(), e);
347+
}
348+
throw new ScannerException("File processing subtask failed", e);
345349
}
346350
}
347351
return results;

0 commit comments

Comments
 (0)