fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #1932: Better VersionChecker exception handling

Browse Source 
ModVersionFetcher will now return a MissingVersion in case of an exception
instead of letting it propagate upwards.

Also added a generic try/catch to the VersionChecker itself, just in case
any unchecked exception might be triggered inside the thread and at least
not logged correctly.
This commit is contained in:
yueh
2015-10-05 16:10:44 +02:00
parent 1e7126f98e
commit 2521f11a40
20 changed files with 586 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/services/version/github/ReleaseFetcher.java
+32 -5
View File
@@ -1,3 +1,21 @@
/*
* This file is part of Applied Energistics 2.
* Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved.
*
* Applied Energistics 2 is free software: you can redistribute it and/or modify
* 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.
*
* Applied Energistics 2 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 Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Applied Energistics 2. If not, see <http://www.gnu.org/licenses/lgpl>.
*/
package appeng.services.version.github;
@@ -7,6 +25,8 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.List;
import javax.annotation.Nonnull;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
@@ -17,6 +37,7 @@ import appeng.services.version.Channel;
import appeng.services.version.Version;
import appeng.services.version.VersionCheckerConfig;
import appeng.services.version.VersionParser;
import appeng.services.version.exceptions.VersionCheckerException;
public final class ReleaseFetcher
@@ -24,10 +45,12 @@ public final class ReleaseFetcher
private static final String GITHUB_RELEASES_URL = "https://api.github.com/repos/AppliedEnergistics/Applied-Energistics-2/releases";
private static final FormattedRelease EXCEPTIONAL_RELEASE = new MissingFormattedRelease();
@Nonnull
private final VersionCheckerConfig config;
@Nonnull
private final VersionParser parser;
public ReleaseFetcher( final VersionCheckerConfig config, final VersionParser parser )
public ReleaseFetcher( @Nonnull final VersionCheckerConfig config, @Nonnull final VersionParser parser )
{
this.config = config;
this.parser = parser;
@@ -50,13 +73,17 @@ public final class ReleaseFetcher
return latestFitRelease;
}
catch( final MalformedURLException e )
catch( final VersionCheckerException e )
{
AELog.error( e );
}
catch( final IOException e )
catch( MalformedURLException e )
{
AELog.warning( "Could not connect to %s.", GITHUB_RELEASES_URL );
AELog.error( e );
}
catch( IOException e )
{
AELog.error( e );
}
return EXCEPTIONAL_RELEASE;
@@ -67,7 +94,7 @@ public final class ReleaseFetcher
return IOUtils.toString( url );
}
private FormattedRelease getLatestFitRelease( final Iterable<Release> releases )
private FormattedRelease getLatestFitRelease( final Iterable<Release> releases ) throws VersionCheckerException
{
final String levelInConfig = this.config.level();
final Channel level = Channel.valueOf( levelInConfig );