@ -56,8 +56,7 @@ import net.yacy.kelondro.workflow.WorkflowThread;
import net.yacy.peers.Seed ; import net.yacy.peers.Seed ;
import net.yacy.search.SwitchboardConstants ; import net.yacy.search.SwitchboardConstants ;
public class serverSwitch public class serverSwitch {
{
// configuration management
// configuration management
private final File configFile ;
private final File configFile ;
@ -71,12 +70,11 @@ public class serverSwitch
private final ConcurrentMap < String , String > configRemoved ;
private final ConcurrentMap < String , String > configRemoved ;
private final NavigableMap < String , BusyThread > workerThreads ;
private final NavigableMap < String , BusyThread > workerThreads ;
private YaCyHttpServer httpserver ; // implemented HttpServer
private YaCyHttpServer httpserver ; // implemented HttpServer
private ConcurrentMap < String , Integer > upnpPortMap = new ConcurrentHashMap < > ( ) ;
private boolean isConnectedViaUpnp ;
public serverSwitch (
public serverSwitch ( final File dataPath , final File appPath ,
final File dataPath ,
final String initPath , final String configPath ) {
final File appPath ,
final String initPath ,
final String configPath ) {
// we initialize the switchboard with a property file,
// we initialize the switchboard with a property file,
// but maintain these properties then later in a new 'config' file
// but maintain these properties then later in a new 'config' file
// to reset all changed configs, the config file must
// to reset all changed configs, the config file must
@ -85,22 +83,25 @@ public class serverSwitch
// file name of the config file
// file name of the config file
this . dataPath = dataPath ;
this . dataPath = dataPath ;
this . appPath = appPath ;
this . appPath = appPath ;
this . configComment = "This is an automatically generated file, updated by serverAbstractSwitch and initialized by " + initPath ;
this . configComment = "This is an automatically generated file, updated by serverAbstractSwitch and initialized by "
+ initPath ;
final File initFile = new File ( appPath , initPath ) ;
final File initFile = new File ( appPath , initPath ) ;
this . configFile = new File ( dataPath , configPath ) ; // propertiesFile(config);
this . configFile = new File ( dataPath , configPath ) ; // propertiesFile(config);
this . firstInit = ! this . configFile . exists ( ) ; // this is true if the application was started for the first time
this . firstInit = ! this . configFile . exists ( ) ; // this is true if the
// application was started
// for the first time
new File ( this . configFile . getParent ( ) ) . mkdir ( ) ;
new File ( this . configFile . getParent ( ) ) . mkdir ( ) ;
// predefine init's
// predefine init's
final ConcurrentMap < String , String > initProps ;
final ConcurrentMap < String , String > initProps ;
if ( initFile . exists ( ) ) { if ( initFile . exists ( ) ) {
initProps = FileUtils . loadMap ( initFile ) ;
initProps = FileUtils . loadMap ( initFile ) ;
} else {
} else {
initProps = new ConcurrentHashMap < String , String > ( ) ;
initProps = new ConcurrentHashMap < String , String > ( ) ;
}
}
// load config's from last save
// load config's from last save
if ( this . configFile . exists ( ) ) { if ( this . configFile . exists ( ) ) {
this . configProps = FileUtils . loadMap ( this . configFile ) ;
this . configProps = FileUtils . loadMap ( this . configFile ) ;
} else {
} else {
this . configProps = new ConcurrentHashMap < String , String > ( ) ;
this . configProps = new ConcurrentHashMap < String , String > ( ) ;
@ -108,12 +109,12 @@ public class serverSwitch
// remove all values from config that do not appear in init
// remove all values from config that do not appear in init
this . configRemoved = new ConcurrentHashMap < String , String > ( ) ;
this . configRemoved = new ConcurrentHashMap < String , String > ( ) ;
synchronized ( this . configProps ) { synchronized ( this . configProps ) {
Iterator < String > i = this . configProps . keySet ( ) . iterator ( ) ;
Iterator < String > i = this . configProps . keySet ( ) . iterator ( ) ;
String key ;
String key ;
while ( i . hasNext ( ) ) { while ( i . hasNext ( ) ) {
key = i . next ( ) ;
key = i . next ( ) ;
if ( ! ( initProps . containsKey ( key ) ) ) { if ( ! ( initProps . containsKey ( key ) ) ) {
this . configRemoved . put ( key , this . configProps . get ( key ) ) ;
this . configRemoved . put ( key , this . configProps . get ( key ) ) ;
i . remove ( ) ;
i . remove ( ) ;
}
}
@ -124,7 +125,8 @@ public class serverSwitch
initProps . putAll ( this . configProps ) ;
initProps . putAll ( this . configProps ) ;
this . configProps = initProps ;
this . configProps = initProps ;
// save result; this may initially create a config file after initialization
// save result; this may initially create a config file after
// initialization
saveConfig ( ) ;
saveConfig ( ) ;
}
}
@ -132,7 +134,7 @@ public class serverSwitch
this . workerThreads = new TreeMap < String , BusyThread > ( ) ;
this . workerThreads = new TreeMap < String , BusyThread > ( ) ;
// init busy state control
// init busy state control
// this.serverJobs = 0;
// this.serverJobs = 0;
// init server tracking
// init server tracking
serverAccessTracker . init (
serverAccessTracker . init (
@ -142,48 +144,95 @@ public class serverSwitch
}
}
/ * *
/ * *
* get my public IP , either set statically or figure out dynamic * get my public IP , either set statically or figure out dynamic This method
* This method is deprecated because there may be more than one public IPs of this peer , * is deprecated because there may be more than one public IPs of this peer ,
* i . e . one IPv4 and one IPv6 . Please use myPublicIPs ( ) instead
* i . e . one IPv4 and one IPv6 . Please use myPublicIPs ( ) instead
*
* @return the public IP of this peer , if known
* @return the public IP of this peer , if known
* /
* /
@Deprecated
@Deprecated
public String myPublicIP ( ) {
public String myPublicIP ( ) {
// if a static IP was configured, we have to return it here ...
// if a static IP was configured, we have to return it here ...
final String staticIP = getConfig ( "staticIP" , "" ) ;
final String staticIP = getConfig ( "staticIP" , "" ) ;
if ( staticIP . length ( ) > 0 ) return staticIP ;
if ( staticIP . length ( ) > 0 )
return staticIP ;
// otherwise we return the real IP address of this host
// otherwise we return the real IP address of this host
final InetAddress pLIP = Domains . myPublicLocalIP ( ) ;
final InetAddress pLIP = Domains . myPublicLocalIP ( ) ;
if ( pLIP ! = null ) return pLIP . getHostAddress ( ) ;
if ( pLIP ! = null )
return pLIP . getHostAddress ( ) ;
return null ;
return null ;
}
}
/ * *
/ * *
* Get all my public IPs . If there was a static IP assignment , only one , that IP is returned .
* Get all my public IPs . If there was a static IP assignment , only one ,
* that IP is returned .
*
* @return a set of IPs which are supposed to be my own public IPs
* @return a set of IPs which are supposed to be my own public IPs
* /
* /
public Set < String > myPublicIPs ( ) {
public Set < String > myPublicIPs ( ) {
// if a static IP was configured, we have to return it here ...
// if a static IP was configured, we have to return it here ...
final String staticIP = getConfig ( "staticIP" , "" ) ;
final String staticIP = getConfig ( "staticIP" , "" ) ;
if ( staticIP . length ( ) > 0 ) { if ( staticIP . length ( ) > 0 ) {
HashSet < String > h = new HashSet < > ( ) ;
HashSet < String > h = new HashSet < > ( ) ;
h . add ( staticIP ) ;
h . add ( staticIP ) ;
return h ;
return h ;
}
}
Set < String > h = new LinkedHashSet < > ( ) ;
Set < String > h = new LinkedHashSet < > ( ) ;
for ( InetAddress i : Domains . myPublicIPv6 ( ) ) { for ( InetAddress i : Domains . myPublicIPv6 ( ) ) {
String s = i . getHostAddress ( ) ;
String s = i . getHostAddress ( ) ;
if ( Seed . isProperIP ( s ) ) h . add ( s ) ;
if ( Seed . isProperIP ( s ) )
h . add ( s ) ;
}
}
for ( InetAddress i : Domains . myPublicIPv4 ( ) ) { for ( InetAddress i : Domains . myPublicIPv4 ( ) ) {
String s = i . getHostAddress ( ) ;
String s = i . getHostAddress ( ) ;
if ( Seed . isProperIP ( s ) ) h . add ( s ) ;
if ( Seed . isProperIP ( s ) )
h . add ( s ) ;
}
}
return h ;
return h ;
}
}
/ * *
* Gets public port . May differ from local port due to NATting . This method
* will eventually removed once nobody used IPv4 anymore , but until then we
* have to live with it .
*
* @param key
* original key from config ( for example "port" or "port.ssl" )
* @param dflt
* default value which will be used if no value is found
* @return the public port of this system on its IPv4 address
*
* @see # getLocalPort ( String , int )
* /
public int getPublicPort ( final String key , final int dflt ) {
if ( isConnectedViaUpnp & & upnpPortMap . containsKey ( key ) ) {
return upnpPortMap . get ( key ) . intValue ( ) ;
}
// TODO: add way of setting and retrieving port for manual NAT
return getConfigInt ( key , dflt ) ;
}
/ * *
* Wrapper for { @link # getConfigInt ( String , int ) } to have a more consistent
* API .
*
* @param key
* original key from config ( for example "port" or "port.ssl" )
* @param dflt
* default value which will be used if no value is found
* @return the local port of this system
* @see # getPublicPort ( String , int )
* /
public int getLocalPort ( final String key , final int dflt ) {
return getConfigInt ( key , dflt ) ;
}
// a logger for this switchboard
// a logger for this switchboard
public void setLog ( final ConcurrentLog log ) {
public void setLog ( final ConcurrentLog log ) {
this . log = log ;
this . log = log ;
@ -195,12 +244,14 @@ public class serverSwitch
/ * *
/ * *
* add whole map of key - value pairs to config
* add whole map of key - value pairs to config
*
* @param otherConfigs
* @param otherConfigs
* /
* /
public void setConfig ( final Map < String , String > otherConfigs ) {
public void setConfig ( final Map < String , String > otherConfigs ) {
final Iterator < Map . Entry < String , String > > i = otherConfigs . entrySet ( ) . iterator ( ) ;
final Iterator < Map . Entry < String , String > > i = otherConfigs . entrySet ( )
. iterator ( ) ;
Map . Entry < String , String > entry ;
Map . Entry < String , String > entry ;
while ( i . hasNext ( ) ) { while ( i . hasNext ( ) ) {
entry = i . next ( ) ;
entry = i . next ( ) ;
setConfig ( entry . getKey ( ) , entry . getValue ( ) ) ;
setConfig ( entry . getKey ( ) , entry . getValue ( ) ) ;
}
}
@ -225,7 +276,7 @@ public class serverSwitch
public void setConfig ( final String key , final String value ) {
public void setConfig ( final String key , final String value ) {
// set the value
// set the value
final String oldValue = this . configProps . put ( key , value ) ;
final String oldValue = this . configProps . put ( key , value ) ;
if ( oldValue = = null | | ! value . equals ( oldValue ) ) { if ( oldValue = = null | | ! value . equals ( oldValue ) ) {
saveConfig ( ) ;
saveConfig ( ) ;
}
}
}
}
@ -237,8 +288,11 @@ public class serverSwitch
/ * *
/ * *
* Gets a configuration parameter from the properties .
* Gets a configuration parameter from the properties .
*
*
* @param key name of the configuration parameter
* @param key
* @param dflt default value which will be used in case parameter can not be found or if it is invalid
* name of the configuration parameter
* @param dflt
* default value which will be used in case parameter can not be
* found or if it is invalid
* @return value if the parameter or default value
* @return value if the parameter or default value
* /
* /
public String getConfig ( final String key , final String dflt ) {
public String getConfig ( final String key , final String dflt ) {
@ -246,7 +300,7 @@ public class serverSwitch
final String s = this . configProps . get ( key ) ;
final String s = this . configProps . get ( key ) ;
// return value
// return value
if ( s = = null ) { if ( s = = null ) {
return dflt ;
return dflt ;
}
}
return s ;
return s ;
@ -255,14 +309,17 @@ public class serverSwitch
/ * *
/ * *
* Gets a configuration parameter from the properties .
* Gets a configuration parameter from the properties .
*
*
* @param key name of the configuration parameter
* @param key
* @param dflt default value which will be used in case parameter can not be found or if it is invalid
* name of the configuration parameter
* @param dflt
* default value which will be used in case parameter can not be
* found or if it is invalid
* @return value if the parameter or default value
* @return value if the parameter or default value
* /
* /
public long getConfigLong ( final String key , final long dflt ) {
public long getConfigLong ( final String key , final long dflt ) {
try {
try {
return Long . parseLong ( getConfig ( key , Long . toString ( dflt ) ) ) ;
return Long . parseLong ( getConfig ( key , Long . toString ( dflt ) ) ) ;
} catch ( final NumberFormatException e ) { } catch ( final NumberFormatException e ) {
return dflt ;
return dflt ;
}
}
}
}
@ -270,29 +327,60 @@ public class serverSwitch
/ * *
/ * *
* Gets a configuration parameter from the properties .
* Gets a configuration parameter from the properties .
*
*
* @param key name of the configuration parameter
* @param key
* @param dflt default value which will be used in case parameter can not be found or if it is invalid
* name of the configuration parameter
* @param dflt
* default value which will be used in case parameter can not be
* found or if it is invalid
* @return value if the parameter or default value
* @return value if the parameter or default value
* /
* /
public float getConfigFloat ( final String key , final float dflt ) {
public float getConfigFloat ( final String key , final float dflt ) {
try {
try {
return Float . parseFloat ( getConfig ( key , Float . toString ( dflt ) ) ) ;
return Float . parseFloat ( getConfig ( key , Float . toString ( dflt ) ) ) ;
} catch ( final NumberFormatException e ) { } catch ( final NumberFormatException e ) {
return dflt ;
return dflt ;
}
}
}
}
public boolean isConnectedViaUpnp ( ) {
return isConnectedViaUpnp ;
}
public void setConnectedViaUpnp ( final boolean isConnectedViaUpnp ) {
this . isConnectedViaUpnp = isConnectedViaUpnp ;
if ( ! isConnectedViaUpnp ) {
upnpPortMap . clear ( ) ;
}
}
public void setUpnpPorts ( final String key , final int port ) {
upnpPortMap . put ( key , Integer . valueOf ( port ) ) ;
}
public void removeUpnpPort ( final String key ) {
upnpPortMap . remove ( key ) ;
}
/ * *
/ * *
* Gets a configuration parameter from the properties .
* Gets a configuration parameter from the properties .
*
*
* @param key name of the configuration parameter
* @param key
* @param dflt default value which will be used in case parameter can not be found or if it is invalid
* name of the configuration parameter
* @param dflt
* default value which will be used in case parameter can not be
* found or if it is invalid
* @return value if the parameter or default value
* @return value if the parameter or default value
* /
* /
public int getConfigInt ( final String key , final int dflt ) {
public int getConfigInt ( final String key , final int dflt ) {
try {
try {
return Integer . parseInt ( getConfig ( key , Integer . toString ( dflt ) ) ) ;
return Integer . parseInt ( getConfig ( key , Integer . toString ( dflt ) ) ) ;
} catch ( final NumberFormatException e ) {
} catch ( final NumberFormatException e ) {
return dflt ;
return dflt ;
}
}
}
}
@ -300,8 +388,11 @@ public class serverSwitch
/ * *
/ * *
* Gets a configuration parameter from the properties .
* Gets a configuration parameter from the properties .
*
*
* @param key name of the configuration parameter
* @param key
* @param dflt default value which will be used in case parameter can not be found or if it is invalid
* name of the configuration parameter
* @param dflt
* default value which will be used in case parameter can not be
* found or if it is invalid
* @return value if the parameter or default value
* @return value if the parameter or default value
* /
* /
public boolean getConfigBool ( final String key , final boolean dflt ) {
public boolean getConfigBool ( final String key , final boolean dflt ) {
@ -311,12 +402,15 @@ public class serverSwitch
/ * *
/ * *
* Create a File instance for a configuration setting specifying a path .
* Create a File instance for a configuration setting specifying a path .
*
*
* @param key config key
* @param key
* @param dflt default path value , that is used when there is no value < code > key < / code > in the
* config key
* configuration .
* @param dflt
* @return if the value of the setting is an absolute path String , then the returned File is derived from
* default path value , that is used when there is no value
* this setting only . Otherwise the path ' s file is constructed from the applications root path +
* < code > key < / code > in the configuration .
* the relative path setting .
* @return if the value of the setting is an absolute path String , then the
* returned File is derived from this setting only . Otherwise the
* path ' s file is constructed from the applications root path + the
* relative path setting .
* /
* /
public File getDataPath ( final String key , final String dflt ) {
public File getDataPath ( final String key , final String dflt ) {
return getFileByPath ( key , dflt , this . dataPath ) ;
return getFileByPath ( key , dflt , this . dataPath ) ;
@ -324,6 +418,7 @@ public class serverSwitch
/ * *
/ * *
* return file at path from config entry "key" , or fallback to default dflt
* return file at path from config entry "key" , or fallback to default dflt
*
* @param key
* @param key
* @param dflt
* @param dflt
* @return
* @return
@ -335,7 +430,8 @@ public class serverSwitch
private File getFileByPath ( String key , String dflt , File prefix ) {
private File getFileByPath ( String key , String dflt , File prefix ) {
final String path = getConfig ( key , dflt ) . replace ( '\\' , '/' ) ;
final String path = getConfig ( key , dflt ) . replace ( '\\' , '/' ) ;
final File f = new File ( path ) ;
final File f = new File ( path ) ;
return ( f . isAbsolute ( ) ? new File ( f . getAbsolutePath ( ) ) : new File ( prefix , path ) ) ;
return ( f . isAbsolute ( ) ? new File ( f . getAbsolutePath ( ) ) : new File (
prefix , path ) ) ;
}
}
public Iterator < String > configKeys ( ) {
public Iterator < String > configKeys ( ) {
@ -352,7 +448,8 @@ public class serverSwitch
}
}
/ * *
/ * *
* Gets configuration parameters which have been removed during initialization .
* Gets configuration parameters which have been removed during
* initialization .
*
*
* @return contains parameter name as key and parameter value as value
* @return contains parameter name as key and parameter value as value
* /
* /
@ -360,13 +457,10 @@ public class serverSwitch
return this . configRemoved ;
return this . configRemoved ;
}
}
public void deployThread (
public void deployThread ( final String threadName ,
final String threadName ,
final String threadShortDescription ,
final String threadShortDescription ,
final String threadLongDescription ,
final String threadLongDescription , final String threadMonitorURL ,
final String threadMonitorURL ,
final BusyThread newThread , final long startupDelay ) {
final BusyThread newThread ,
final long startupDelay ) {
deployThread (
deployThread (
threadName ,
threadName ,
threadShortDescription ,
threadShortDescription ,
@ -380,18 +474,14 @@ public class serverSwitch
Double . parseDouble ( getConfig ( threadName + "_loadprereq" , "9.0" ) ) ) ;
Double . parseDouble ( getConfig ( threadName + "_loadprereq" , "9.0" ) ) ) ;
}
}
public void deployThread (
public void deployThread ( final String threadName ,
final String threadName ,
final String threadShortDescription ,
final String threadShortDescription ,
final String threadLongDescription ,
final String threadLongDescription , final String threadMonitorURL ,
final String threadMonitorURL ,
final BusyThread newThread , final long startupDelay ,
final BusyThread newThread ,
final long initialIdleSleep , final long initialBusySleep ,
final long startupDelay ,
final long initialIdleSleep ,
final long initialBusySleep ,
final long initialMemoryPreRequisite ,
final long initialMemoryPreRequisite ,
final double initialLoadPreRequisite ) {
final double initialLoadPreRequisite ) {
if ( newThread . isAlive ( ) ) { if ( newThread . isAlive ( ) ) {
throw new RuntimeException (
throw new RuntimeException (
"undeployed threads must not live; they are started as part of the deployment" ) ;
"undeployed threads must not live; they are started as part of the deployment" ) ;
}
}
@ -400,35 +490,38 @@ public class serverSwitch
try {
try {
x = Long . parseLong ( getConfig ( threadName + "_idlesleep" , "novalue" ) ) ;
x = Long . parseLong ( getConfig ( threadName + "_idlesleep" , "novalue" ) ) ;
newThread . setIdleSleep ( x ) ;
newThread . setIdleSleep ( x ) ;
} catch ( final NumberFormatException e ) { } catch ( final NumberFormatException e ) {
newThread . setIdleSleep ( initialIdleSleep ) ;
newThread . setIdleSleep ( initialIdleSleep ) ;
setConfig ( threadName + "_idlesleep" , initialIdleSleep ) ;
setConfig ( threadName + "_idlesleep" , initialIdleSleep ) ;
}
}
try {
try {
x = Long . parseLong ( getConfig ( threadName + "_busysleep" , "novalue" ) ) ;
x = Long . parseLong ( getConfig ( threadName + "_busysleep" , "novalue" ) ) ;
newThread . setBusySleep ( x ) ;
newThread . setBusySleep ( x ) ;
} catch ( final NumberFormatException e ) { } catch ( final NumberFormatException e ) {
newThread . setBusySleep ( initialBusySleep ) ;
newThread . setBusySleep ( initialBusySleep ) ;
setConfig ( threadName + "_busysleep" , initialBusySleep ) ;
setConfig ( threadName + "_busysleep" , initialBusySleep ) ;
}
}
try {
try {
x = Long . parseLong ( getConfig ( threadName + "_memprereq" , "novalue" ) ) ;
x = Long . parseLong ( getConfig ( threadName + "_memprereq" , "novalue" ) ) ;
newThread . setMemPreReqisite ( x ) ;
newThread . setMemPreReqisite ( x ) ;
} catch ( final NumberFormatException e ) { } catch ( final NumberFormatException e ) {
newThread . setMemPreReqisite ( initialMemoryPreRequisite ) ;
newThread . setMemPreReqisite ( initialMemoryPreRequisite ) ;
setConfig ( threadName + "_memprereq" , initialMemoryPreRequisite ) ;
setConfig ( threadName + "_memprereq" , initialMemoryPreRequisite ) ;
}
}
try {
try {
final double load = Double . parseDouble ( getConfig ( threadName + "_loadprereq" , "novalue" ) ) ;
final double load = Double . parseDouble ( getConfig ( threadName
+ "_loadprereq" , "novalue" ) ) ;
newThread . setLoadPreReqisite ( load ) ;
newThread . setLoadPreReqisite ( load ) ;
} catch ( final NumberFormatException e ) { } catch ( final NumberFormatException e ) {
newThread . setLoadPreReqisite ( initialLoadPreRequisite ) ;
newThread . setLoadPreReqisite ( initialLoadPreRequisite ) ;
setConfig ( threadName + "_loadprereq" , ( float ) initialLoadPreRequisite ) ;
setConfig ( threadName + "_loadprereq" ,
( float ) initialLoadPreRequisite ) ;
}
}
newThread . setDescription ( threadShortDescription , threadLongDescription , threadMonitorURL ) ;
newThread . setDescription ( threadShortDescription , threadLongDescription ,
threadMonitorURL ) ;
this . workerThreads . put ( threadName , newThread ) ;
this . workerThreads . put ( threadName , newThread ) ;
// start the thread
// start the thread
if ( this . workerThreads . containsKey ( threadName ) ) { if ( this . workerThreads . containsKey ( threadName ) ) {
newThread . start ( ) ;
newThread . start ( ) ;
}
}
}
}
@ -437,52 +530,55 @@ public class serverSwitch
return this . workerThreads . get ( threadName ) ;
return this . workerThreads . get ( threadName ) ;
}
}
public void setThreadPerformance (
public void setThreadPerformance ( final String threadName ,
final String threadName ,
final long idleMillis , final long busyMillis ,
final long idleMillis ,
final long memprereqBytes , final double loadprereq ) {
final long busyMillis ,
final long memprereqBytes ,
final double loadprereq ) {
final BusyThread thread = this . workerThreads . get ( threadName ) ;
final BusyThread thread = this . workerThreads . get ( threadName ) ;
if ( thread ! = null ) {
if ( thread ! = null ) {
setConfig ( threadName + "_idlesleep" , thread . setIdleSleep ( idleMillis ) ) ;
setConfig ( threadName + "_idlesleep" ,
setConfig ( threadName + "_busysleep" , thread . setBusySleep ( busyMillis ) ) ;
thread . setIdleSleep ( idleMillis ) ) ;
setConfig ( threadName + "_busysleep" ,
thread . setBusySleep ( busyMillis ) ) ;
setConfig ( threadName + "_memprereq" , memprereqBytes ) ;
setConfig ( threadName + "_memprereq" , memprereqBytes ) ;
thread . setMemPreReqisite ( memprereqBytes ) ;
thread . setMemPreReqisite ( memprereqBytes ) ;
setConfig ( threadName + "_loadprereq" , ( float ) loadprereq ) ; setConfig ( threadName + "_loadprereq" , ( float ) loadprereq ) ;
thread . setLoadPreReqisite ( loadprereq ) ;
thread . setLoadPreReqisite ( loadprereq ) ;
}
}
}
}
public synchronized void terminateThread ( final String threadName , final boolean waitFor ) {
public synchronized void terminateThread ( final String threadName ,
if ( this . workerThreads . containsKey ( threadName ) ) {
final boolean waitFor ) {
( ( WorkflowThread ) this . workerThreads . get ( threadName ) ) . terminate ( waitFor ) ;
if ( this . workerThreads . containsKey ( threadName ) ) {
( ( WorkflowThread ) this . workerThreads . get ( threadName ) )
. terminate ( waitFor ) ;
this . workerThreads . remove ( threadName ) ;
this . workerThreads . remove ( threadName ) ;
}
}
}
}
public void intermissionAllThreads ( final long pause ) {
public void intermissionAllThreads ( final long pause ) {
final Iterator < String > e = this . workerThreads . keySet ( ) . iterator ( ) ;
final Iterator < String > e = this . workerThreads . keySet ( ) . iterator ( ) ;
while ( e . hasNext ( ) ) { while ( e . hasNext ( ) ) {
this . workerThreads . get ( e . next ( ) ) . intermission ( pause ) ;
this . workerThreads . get ( e . next ( ) ) . intermission ( pause ) ;
}
}
}
}
public synchronized void terminateAllThreads ( final boolean waitFor ) {
public synchronized void terminateAllThreads ( final boolean waitFor ) {
Iterator < String > e = this . workerThreads . keySet ( ) . iterator ( ) ;
Iterator < String > e = this . workerThreads . keySet ( ) . iterator ( ) ;
while ( e . hasNext ( ) ) {
while ( e . hasNext ( ) ) {
( ( WorkflowThread ) this . workerThreads . get ( e . next ( ) ) ) . terminate ( false ) ;
( ( WorkflowThread ) this . workerThreads . get ( e . next ( ) ) )
. terminate ( false ) ;
}
}
if ( waitFor ) { if ( waitFor ) {
e = this . workerThreads . keySet ( ) . iterator ( ) ;
e = this . workerThreads . keySet ( ) . iterator ( ) ;
while ( e . hasNext ( ) ) {
while ( e . hasNext ( ) ) {
( ( WorkflowThread ) this . workerThreads . get ( e . next ( ) ) ) . terminate ( true ) ;
( ( WorkflowThread ) this . workerThreads . get ( e . next ( ) ) )
. terminate ( true ) ;
e . remove ( ) ;
e . remove ( ) ;
}
}
}
}
}
}
public Iterator < String > /* of serverThread-Names (String)*/threadNames ( ) { public Iterator < String > /* of serverThread-Names (String) */threadNames ( ) {
return this . workerThreads . keySet ( ) . iterator ( ) ;
return this . workerThreads . keySet ( ) . iterator ( ) ;
}
}
@ -504,47 +600,64 @@ public class serverSwitch
}
}
/ * *
/ * *
* Retrieve text data ( e . g . config file ) from file file may be an url or a filename with path relative to * Retrieve text data ( e . g . config file ) from file file may be an url or a
* rootPath parameter * filename with path relative to rootPath parameter
*
*
* @param file url or filename
* @param file
* @param rootPath searchpath for file
* url or filename
* @param file file to use when remote fetching fails ( null if unused )
* @param rootPath
* searchpath for file
* @param file
* file to use when remote fetching fails ( null if unused )
* /
* /
public Reader getConfigFileFromWebOrLocally ( final String uri , final String rootPath , final File file )
public Reader getConfigFileFromWebOrLocally ( final String uri ,
throws IOException ,
final String rootPath , final File file ) throws IOException ,
FileNotFoundException {
FileNotFoundException {
if ( uri . startsWith ( "http://" ) | | uri . startsWith ( "https://" ) ) { if ( uri . startsWith ( "http://" ) | | uri . startsWith ( "https://" ) ) {
final String [ ] uris = uri . split ( "," ) ;
final String [ ] uris = uri . split ( "," ) ;
for ( String netdef : uris ) { for ( String netdef : uris ) {
netdef = netdef . trim ( ) ;
netdef = netdef . trim ( ) ;
try {
try {
final RequestHeader reqHeader = new RequestHeader ( ) ;
final RequestHeader reqHeader = new RequestHeader ( ) ;
reqHeader . put ( HeaderFramework . USER_AGENT , ClientIdentification . yacyInternetCrawlerAgent . userAgent ) ;
reqHeader
final HTTPClient client = new HTTPClient ( ClientIdentification . yacyInternetCrawlerAgent ) ;
. put ( HeaderFramework . USER_AGENT ,
ClientIdentification . yacyInternetCrawlerAgent . userAgent ) ;
final HTTPClient client = new HTTPClient (
ClientIdentification . yacyInternetCrawlerAgent ) ;
client . setHeader ( reqHeader . entrySet ( ) ) ;
client . setHeader ( reqHeader . entrySet ( ) ) ;
byte [ ] data = client . GETbytes ( uri , getConfig ( SwitchboardConstants . ADMIN_ACCOUNT_USER_NAME , "admin" ) , getConfig ( SwitchboardConstants . ADMIN_ACCOUNT_B64MD5 , "" ) , false ) ;
byte [ ] data = client
if ( data = = null | | data . length = = 0 ) {
. GETbytes (
uri ,
getConfig (
SwitchboardConstants . ADMIN_ACCOUNT_USER_NAME ,
"admin" ) ,
getConfig (
SwitchboardConstants . ADMIN_ACCOUNT_B64MD5 ,
"" ) , false ) ;
if ( data = = null | | data . length = = 0 ) {
continue ;
continue ;
}
}
// save locally in case next fetch fails
// save locally in case next fetch fails
if ( file ! = null ) {
if ( file ! = null ) {
FileOutputStream f = new FileOutputStream ( file ) ;
FileOutputStream f = new FileOutputStream ( file ) ;
f . write ( data ) ;
f . write ( data ) ;
f . close ( ) ;
f . close ( ) ;
}
}
return new InputStreamReader ( new BufferedInputStream ( new ByteArrayInputStream ( data ) ) ) ;
return new InputStreamReader ( new BufferedInputStream (
} catch ( final Exception e ) {
new ByteArrayInputStream ( data ) ) ) ;
} catch ( final Exception e ) {
continue ;
continue ;
}
}
}
}
if ( file ! = null & & file . exists ( ) ) { if ( file ! = null & & file . exists ( ) ) {
return new FileReader ( file ) ;
return new FileReader ( file ) ;
}
}
throw new FileNotFoundException ( ) ;
throw new FileNotFoundException ( ) ;
}
}
final File f = ( uri . length ( ) > 0 & & uri . startsWith ( "/" ) ) ? new File ( uri ) : new File ( rootPath , uri ) ;
final File f = ( uri . length ( ) > 0 & & uri . startsWith ( "/" ) ) ? new File ( uri )
if ( f . exists ( ) ) return new FileReader ( f ) ;
: new File ( rootPath , uri ) ;
if ( f . exists ( ) )
return new FileReader ( f ) ;
throw new FileNotFoundException ( f . toString ( ) ) ;
throw new FileNotFoundException ( f . toString ( ) ) ;
}
}
@ -562,7 +675,8 @@ public class serverSwitch
/ * *
/ * *
* Generates a random password of a given length .
* Generates a random password of a given length .
*
*
* @param length length o password
* @param length
* length o password
* @return password of given length
* @return password of given length
* /
* /
public String genRandomPassword ( final int length ) {
public String genRandomPassword ( final int length ) {
@ -570,13 +684,16 @@ public class serverSwitch
pwGenerator . nextBytes ( bytes ) ;
pwGenerator . nextBytes ( bytes ) ;
return Digest . encodeMD5Hex ( bytes ) ;
return Digest . encodeMD5Hex ( bytes ) ;
}
}
/ * *
/ * *
* set / remember jetty server
* set / remember jetty server
*
* @param jettyserver
* @param jettyserver
* /
* /
public void setHttpServer ( YaCyHttpServer jettyserver ) {
public void setHttpServer ( YaCyHttpServer jettyserver ) {
this . httpserver = jettyserver ;
this . httpserver = jettyserver ;
}
}
public YaCyHttpServer getHttpServer ( ) {
public YaCyHttpServer getHttpServer ( ) {
return httpserver ;
return httpserver ;
}
}
Marc Nause
10 years ago