Changeset 124c2b5


Ignore:
Timestamp:
Oct 2, 2016 3:44:49 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
011d08b1
Parents:
1e375c6d
Message:

i2psnark: Add standalone shutdown method

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • apps/i2psnark/java/src/org/klomp/snark/standalone/RunStandalone.java

    r1e375c6d r124c2b5  
    1616    private int _port = 8002;
    1717    private String _host = "127.0.0.1";
     18    private static RunStandalone _instance;
    1819
    1920    private RunStandalone(String args[]) throws Exception {
     
    3334     *  Usage: RunStandalone [host [port]] (but must match what's in the jetty-i2psnark.xml file)
    3435     */
    35     public static void main(String args[]) {
     36    public synchronized static void main(String args[]) {
    3637        try {
    3738            RunStandalone runner = new RunStandalone(args);
    3839            runner.start();
     40            _instance = runner;
    3941        } catch (Exception e) {
    4042            e.printStackTrace();
     
    6062        _jettyStart.shutdown(null);
    6163    }
     64   
     65    /** @since 0.9.27 */
     66    public synchronized static void shutdown() {
     67        if (_instance != null)
     68            _instance.stop();
     69        // JettyStart.shutdown() is threaded
     70        try {
     71           Thread.sleep(3000);
     72        } catch (InterruptedException ie) {}
     73        System.exit(1);
     74    }
    6275}
  • history.txt

    r1e375c6d r124c2b5  
     12016-10-02 zzz
     2 * Crypto: Add EdDSA private key spec constructor for hash
     3 * i2psnark: Add standalone shutdown method
     4 * i2ptunnel: Registration page layout fixes
     5 * SusiMail:
     6   - Show settings button even if no messages
     7   - Add nonce to forms
     8
     92016-09-24 zzz
     10 * DesktopGUI: Enable by default on Windows
     11 * i2ptunnel:
     12   - Accept default 'mysite.i2p' as a valid spoof host
     13   - Don't wrap destination in status message box
     14 * Reseed: Remove user.mx24.eu as requested
     15 * Utils: Move SipHashInline from util to crypto
     16
    1172016-09-22 zzz
    218 * Crypto: Don't NPE in encoding when field not set
  • router/java/src/net/i2p/router/RouterVersion.java

    r1e375c6d r124c2b5  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 11;
     21    public final static long BUILD = 12;
    2222
    2323    /** for example "-test" */
    24     public final static String EXTRA = "";
     24    public final static String EXTRA = "-rc";
    2525    public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
    2626    public static void main(String args[]) {
Note: See TracChangeset for help on using the changeset viewer.