Skip to content

Commit

Permalink
Improve logging in case bco starts in offline mode.
Browse files Browse the repository at this point in the history
  • Loading branch information
@DivineThreepwood
DivineThreepwood committed Dec 12, 2023
1 parent 204ddc2 commit 5ce4d40
Showing 1 changed file with 17 additions and 18 deletions.
35 changes: 17 additions & 18 deletions ...le/storage/src/main/java/org/openbase/jul/storage/registry/version/GitVersionControl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
* it under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Lesser Public License for more details.
*
*
* You should have received a copy of the GNU General Lesser Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
Expand All @@ -31,6 +31,7 @@
import org.eclipse.jgit.lib.Ref;
import org.openbase.jps.core.JPService;
import org.openbase.jul.exception.CouldNotPerformException;
import org.openbase.jul.exception.ExceptionProcessor;
import org.openbase.jul.exception.printer.ExceptionPrinter;
import org.openbase.jul.exception.printer.LogLevel;
import org.openbase.jul.storage.registry.FileSynchronizedRegistry;
Expand All @@ -39,10 +40,9 @@
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.util.Collections;
import java.net.UnknownHostException;

/**
*
* This tool class can be used to handle automated update and compatibility handling of external registry dbs.
*
* @author <a href="mailto:divine@openbase.org">Divine Threepwood</a> //
Expand All @@ -60,7 +60,7 @@ public class GitVersionControl {

public static void syncWithRemoteDatabase(final int latestSupportedDBVersion, final FileSynchronizedRegistry registry) throws CouldNotPerformException {

try(final Git registryDBGit = Git.open(registry.getDatabaseDirectory())) {
try (final Git registryDBGit = Git.open(registry.getDatabaseDirectory())) {

// reset current database state before triggering the remote sync if repo is valid.
if (registryDBGit.getRepository() != null && registryDBGit.getRepository().getFullBranch() != null) {
Expand All @@ -70,9 +70,9 @@ public static void syncWithRemoteDatabase(final int latestSupportedDBVersion, fi
if (!currentBranchName.equals(MASTER_BRANCH_LOCAL_IDENTIFIER) && !currentBranchName.startsWith(RELEASE_BRANCH_LOCAL_PREFIX)) {
if (registryDBGit.status().call().isClean()) {
// sync with remote repo
logger.warn("Custom " + registry + " branch "+currentBranchName+" detected, remote sync will be performed but db auto upgrade will be skipped...");
logger.warn("Custom " + registry + " branch " + currentBranchName + " detected, remote sync will be performed but db auto upgrade will be skipped...");
try {
if(!registryDBGit.pull().call().isSuccessful()) {
if (!registryDBGit.pull().call().isSuccessful()) {
throw new CouldNotPerformException("Pull was not successful!");
}
} catch (GitAPIException | CouldNotPerformException ex) {
Expand All @@ -88,25 +88,24 @@ public static void syncWithRemoteDatabase(final int latestSupportedDBVersion, fi
registryDBGit.reset().setMode(ResetType.HARD).call();
registryDBGit.clean().setForce(true).call();
} else {
logger.info("Perform initial sync with remote database of "+ registry.getName()+ "...");
logger.info("Perform initial sync with remote database of " + registry.getName() + "...");
}

// sync branches with remote repo
boolean offline = false;
try {
registryDBGit.fetch().call();
} catch (GitAPIException ex) {
final String errorMessage = "Could not sync with remote repository of " + registry.getName() + " and continue in offline mode...";
if(JPService.verboseMode()) {
ExceptionPrinter.printHistory(errorMessage, ex, logger, LogLevel.WARN);
if (ExceptionProcessor.getInitialCause(ex) instanceof UnknownHostException) {
offline = true;
logger.info("Could not sync with remote repository of " + registry.getName() + " and continue in offline mode...");
} else {
logger.warn(errorMessage);
throw ex;
}
offline = true;
}

// checkout latest compatible database
if(JPService.getValue(JPDeveloperMode.class, false)) {
if (JPService.getValue(JPDeveloperMode.class, false)) {

// lookup local branch
boolean localBranchExist = false;
Expand All @@ -129,11 +128,11 @@ public static void syncWithRemoteDatabase(final int latestSupportedDBVersion, fi
int repositoryDBReleaseVersion = 0;
for (Ref ref : registryDBGit.branchList().setListMode(ListMode.REMOTE).call()) {
final String branchName = ref.getName();
if(branchName.startsWith(RELEASE_BRANCH_REMOTE_PREFIX)) {
if (branchName.startsWith(RELEASE_BRANCH_REMOTE_PREFIX)) {
try {
repositoryDBReleaseVersion = Math.max(repositoryDBReleaseVersion, Integer.parseInt(branchName.substring(RELEASE_BRANCH_REMOTE_PREFIX.length())));
} catch (NumberFormatException ex) {
logger.warn(registry.getName() + " remote database contains an invalid release branch["+branchName+"]! Those will be skipped...");
logger.warn(registry.getName() + " remote database contains an invalid release branch[" + branchName + "]! Those will be skipped...");
}
}
}
Expand Down Expand Up @@ -165,12 +164,12 @@ public static void syncWithRemoteDatabase(final int latestSupportedDBVersion, fi
registryDBGit.pull().call();
} catch (final TransportException ex) {
// skip offline warnings.
if(!offline) {
if (!offline) {
throw ex;
}
}
} catch (GitAPIException | CouldNotPerformException | IOException ex) {
throw new CouldNotPerformException("Auto db update of "+ registry.getName()+" failed!", ex);
throw new CouldNotPerformException("Auto db update of " + registry.getName() + " failed!", ex);
}
}
}

0 comments on commit 5ce4d40

Please sign in to comment.