Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ public class DBController implements DBBlocksJournalListener {
private Connection connection;
private ScheduledFuture<?> updater;
private final LocalDateTime blocksJournalCreateDate;
private int processCount;

public DBController(Settings settings, DBModel model, UserInputPasswordProvider userInputPasswordProvider) {
this.settings = settings;
Expand Down Expand Up @@ -232,7 +233,7 @@ public List<DBProcess> getProcesses() {
}

public int getProcessesCount() {
return processes.size();
return processCount;
}

public DBBlocksJournal getBlocksJournal() {
Expand Down Expand Up @@ -303,11 +304,20 @@ private void loadProcesses() {
}
proceedBlocks(tmpProcesses, tmpBlocks);
proceedProcesses(tmpProcesses);
List<DBProcess> procs = tmpProcesses.values().stream()
.filter(p -> !p.hasParent())
// do not show this process if setting is set (current pgSqlBlocks connection)
.filter(p -> settings.getShowBackendPid() || p.getPid() != backendPid || !p.getChildren().isEmpty())
.collect(Collectors.toList());

List<DBProcess> procs = new ArrayList<>();
int tmpCounter = 0;
for (DBProcess process : tmpProcesses.values()) {
// do not show this process if setting is set (current pgSqlBlocks connection)
if (process.getPid() == backendPid && !settings.getShowBackendPid() && !process.hasChildren()) {
continue;
}
tmpCounter++;
if (!process.hasParent()) {
procs.add(process);
}
}
processCount = tmpCounter;
processesLoaded(procs);
} catch (SQLException e) {
LOG.error(String.format("Ошибка при получении процессов для %s", model.getName()), e);
Expand Down