Skip to content

Added error handling to determine uncommitted changes. #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
spsingletary wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Added error handling to determine uncommitted changes. #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f734d4e
Added error handling when exporting tags with remote tag providers.
spsingletary May 25, 2023
154b97a
Added error handling to getActor to prevent blocking when items are d…
spsingletary May 26, 2023
f0bbccb
Added error handling to getActor to prevent blocking when items are d…
spsingletary May 26, 2023
5c9acc5
Additional error handling and logging for the tag export.
spsingletary Aug 2, 2023
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
10 changes: 8 additions & 2 deletions git-gateway/src/main/java/com/axone_io/ignition/git/managers/GitManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,14 @@ public static String getActor(String projectName, String path) {
ProjectManager projectManager = context.getProjectManager();
RuntimeProject project = projectManager.getProject(projectName).get();

ProjectResource projectResource = project.getResource(getResourcePath(path)).get();
return LastModification.of(projectResource).map(LastModification::getActor).orElse("unknown");
ResourcePath resourcePath = getResourcePath(path);
try {
ProjectResource projectResource = project.getResource(resourcePath).get();
return LastModification.of(projectResource).map(LastModification::getActor).orElse("unknown");
} catch (Exception e) {
logger.error(String.valueOf(e), e);
return "unknown";
}
}

public static List getAddedFiles(String projectName) {
Expand Down
36 changes: 23 additions & 13 deletions git-gateway/src/main/java/com/axone_io/ignition/git/managers/GitTagManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import com.inductiveautomation.ignition.common.tags.config.TagConfigurationModel;
import com.inductiveautomation.ignition.common.tags.model.TagPath;
import com.inductiveautomation.ignition.common.tags.model.TagProvider;
import com.inductiveautomation.ignition.common.tags.model.TagProviderInformation;
import com.inductiveautomation.ignition.common.tags.paths.BasicTagPath;
import com.inductiveautomation.ignition.common.tags.paths.parser.TagPathParser;
import com.inductiveautomation.ignition.common.util.LoggerEx;
Expand Down Expand Up @@ -63,20 +64,29 @@ public static void exportTag(Path projectFolderPath) {
Files.createDirectories(tagFolderPath);

for (TagProvider tagProvider : context.getTagManager().getTagProviders()) {
TagPath typesPath = TagPathParser.parse("");
List<TagPath> tagPaths = new ArrayList<>();
tagPaths.add(typesPath);

CompletableFuture<List<TagConfigurationModel>> cfTagModels =
tagProvider.getTagConfigsAsync(tagPaths, true, true);
List<TagConfigurationModel> tModels = cfTagModels.get();

JsonObject json = TagUtilities.toJsonObject(tModels.get(0));
JsonElement sortedJson = JsonUtilities.createDeterministicCopy(json);

Path newFile = tagFolderPath.resolve(tagProvider.getName() + ".json");
logger.info("Attempting to export tags for provider " + tagProvider.getName());
try {
CompletableFuture<TagProviderInformation> cfProviderInfo = tagProvider.getStatusInformation();
TagProviderInformation providerInfo = cfProviderInfo.get();
if (providerInfo == null || !providerInfo.isAvailable()) {
logger.info("Tag provider unavailable. Skipping export for provider " + tagProvider.getName());
continue;
}

Files.writeString(newFile, TAG_GSON.toJson(sortedJson));
TagPath typesPath = TagPathParser.parse("");
List<TagPath> tagPaths = new ArrayList<>();
tagPaths.add(typesPath);
CompletableFuture<List<TagConfigurationModel>> cfTagModels =
tagProvider.getTagConfigsAsync(tagPaths, true, true);
List<TagConfigurationModel> tModels = cfTagModels.get();
JsonObject json = TagUtilities.toJsonObject(tModels.get(0));
JsonElement sortedJson = JsonUtilities.createDeterministicCopy(json);
Path newFile = tagFolderPath.resolve(tagProvider.getName() + ".json");
Files.writeString(newFile, TAG_GSON.toJson(sortedJson));
logger.info("Successfully exported tags for provider " + tagProvider.getName());
} catch (Exception e) {
logger.error(e.toString(), e);
}
}
} catch (Exception e) {
logger.error(e.toString(), e);
Expand Down