PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

#3720: Replace some println calls with proxy logger

Browse Source
This commit is contained in:
Outfluencer 2024-08-07 11:57:09 +02:00 committed by GitHub
parent b64615e298
commit c310e3339f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
View File

@ -7,6 +7,7 @@ import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
import lombok.Data; import lombok.Data;
import net.md_5.bungee.Util; import net.md_5.bungee.Util;
import net.md_5.bungee.api.ProxyServer;
@Data @Data
public class JenkinsModuleSource implements ModuleSource public class JenkinsModuleSource implements ModuleSource
@ -15,7 +16,7 @@ public class JenkinsModuleSource implements ModuleSource
@Override @Override
public void retrieve(ModuleSpec module, ModuleVersion version) public void retrieve(ModuleSpec module, ModuleVersion version)
{ {
System.out.println( "Attempting to Jenkins download module " + module.getName() + " v" + version.getBuild() ); ProxyServer.getInstance().getLogger().info( "Attempting to Jenkins download module " + module.getName() + " v" + version.getBuild() );
try try
{ {
URL website = new URL( "https://ci.md-5.net/job/BungeeCord/" + version.getBuild() + "/artifact/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" ); URL website = new URL( "https://ci.md-5.net/job/BungeeCord/" + version.getBuild() + "/artifact/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" );
@ -25,10 +26,10 @@ public class JenkinsModuleSource implements ModuleSource
con.setReadTimeout( 15000 ); con.setReadTimeout( 15000 );
Files.write( ByteStreams.toByteArray( con.getInputStream() ), module.getFile() ); Files.write( ByteStreams.toByteArray( con.getInputStream() ), module.getFile() );
System.out.println( "Download complete" ); ProxyServer.getInstance().getLogger().info( "Download complete" );
} catch ( IOException ex ) } catch ( IOException ex )
{ {
System.out.println( "Failed to download: " + Util.exception( ex ) ); ProxyServer.getInstance().getLogger().warning( "Failed to download: " + Util.exception( ex ) );
} }
} }
} }

10
proxy/src/main/java/net/md_5/bungee/module/ModuleManager.java
View File

@ -44,7 +44,7 @@ public class ModuleManager
ModuleVersion bungeeVersion = ModuleVersion.parse( proxy.getVersion() ); ModuleVersion bungeeVersion = ModuleVersion.parse( proxy.getVersion() );
if ( bungeeVersion == null ) if ( bungeeVersion == null )
{ {
System.out.println( "Couldn't detect bungee version. Custom build?" ); proxy.getLogger().warning( "Couldn't detect bungee version. Custom build?" );
return; return;
} }
@ -105,19 +105,19 @@ public class ModuleManager
ModuleSource source = knownSources.get( uri.getScheme() ); ModuleSource source = knownSources.get( uri.getScheme() );
if ( source == null ) if ( source == null )
{ {
System.out.println( "Unknown module source: " + s ); proxy.getLogger().warning( "Unknown module source: " + s );
continue; continue;
} }
String name = uri.getAuthority(); String name = uri.getAuthority();
if ( name == null ) if ( name == null )
{ {
System.out.println( "Unknown module host: " + s ); proxy.getLogger().warning( "Unknown module host: " + s );
continue; continue;
} }
ModuleSpec spec = new ModuleSpec( name, new File( moduleDirectory, name + ".jar" ), source ); ModuleSpec spec = new ModuleSpec( name, new File( moduleDirectory, name + ".jar" ), source );
modules.add( spec ); modules.add( spec );
System.out.println( "Discovered module: " + spec ); proxy.getLogger().info( "Discovered module: " + spec );
} }
for ( ModuleSpec module : modules ) for ( ModuleSpec module : modules )
@ -126,7 +126,7 @@ public class ModuleManager
if ( !bungeeVersion.equals( moduleVersion ) ) if ( !bungeeVersion.equals( moduleVersion ) )
{ {
System.out.println( "Attempting to update plugin from " + moduleVersion + " to " + bungeeVersion ); proxy.getLogger().info( "Attempting to update plugin from " + moduleVersion + " to " + bungeeVersion );
module.getProvider().retrieve( module, bungeeVersion ); module.getProvider().retrieve( module, bungeeVersion );
} }
} }