Changeset 146

Show
Ignore:
Timestamp:
04/29/06 14:00:04 (3 years ago)
Author:
jfp
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/jsmtpd/CHANGELOG

    r130 r146  
    1 Version ()  
     1Version 0.6a 
    22        Simplified plugin loader code + long type support 
    33        Changed the way to handle silent smtp extension 
    44        LMTP dummy plugin (it's a modified smtp sender) 
    5         Maildir delivery plugin (untested !) 
     5        Maildir delivery plugin (experimental, tested with solid-pop3d) 
    66        Generic memory cache 
    77        Cache in RBL plugin. 
    88        Bugg fix in dns resolver 
    9         Debug mode in linux startup script to attach a debugger 
    109        SPF plugin (not in distribution, on svn repository) 
    1110        Fix in ldap plugins (close cnx + vdomain fix) 
    12         Moved to commons loggin 
     11        Moved to commons logging 
    1312        To Test: Removed Sun's Javamail implementation, replaced with https://sourceforge.net/projects/tjmail/ (LGPL) 
    1413                -> Seems to be a modified gnu classpath impl ? 
    …… 
    1615        Added GrowableThreadPool (Jsmtpd will no longer keep so much unused threads). This also needs testing ! 
    1716        Refactored DeliveryService to QueueService (just a name change as someone suggested). 
    18          
     17        Linux startup script changed (start foreground, background, attach a remote jvm debug port). 
    1918         
    2019Version 0.5b (Fafnir, maintenance) 

  • trunk/jsmtpd/jsmtpd.sh

    r112 r146  
    1 #!/bin/sh -e 
    2 #-XX:+PrintGCDetails -XX:+PrintGCTimeStamps 
     1#!/bin/sh 
     2 
     3export JSMTPD_DIR=`dirname "$0"`; 
     4JAVA_OPTS="-Xmx512m" 
     5 
     6CDIR=`pwd` 
     7 
     8cd $JSMTPD_DIR 
     9 
     10if [ -z "$1" ] ; then 
     11        echo "Usage: jsmtpd.sh option"; 
     12        echo "jsmtpd.sh debug : run attached with debug port (8000) enabled"; 
     13        echo "jsmtpd.sh run   : run attached"; 
     14        echo "jsmtpd.sh start : run jsmtpd as daemon process" 
     15        echo "jsmtpd.sh stop  : stop previously started jsmtpd as daemon "; 
     16        exit 0; 
     17fi 
     18 
    319CP=.:etc/ 
    420 
    …… 
    2137CP=$CP:plugins/inputIPFilters/jsmtpd-inputIPFilters.jar 
    2238 
    23 JAVA_OPTS="-Xmx512m" 
    2439 
    2540if [ "$1" = "debug" ] ; then 
    26 JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n" 
     41        JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n" 
    2742fi 
    2843 
    29 exec java $JAVA_OPTS  -cp $CP org.jsmtpd.Launcher 
     44 
     45if [ "$1" = "run" ] ; then 
     46        echo "Starting jsmtpd (attached)"; 
     47        exec java $JAVA_OPTS  -cp $CP org.jsmtpd.Launcher 
     48        cd $CDIR 
     49        exit 0; 
     50fi 
     51 
     52 
     53if [ "$1" = "start" ] ; then 
     54        if [ -f $JSMTPD_DIR/jsmtpd.pid ] ; then 
     55                echo "Can't start Jsmtpd, there is pid file indicating it should already be running"; 
     56                echo "Use jsmtpd stop first"; 
     57                cd $CDIR 
     58                exit 0 
     59        fi 
     60        echo "Starting jsmtpd (daemon)"; 
     61        exec java $JAVA_OPTS  -cp $CP org.jsmtpd.Launcher 2>&1 > /dev/null  & 
     62        echo $! > $JSMTPD_DIR/jsmtpd.pid 
     63        echo "JVM pid is $!"; 
     64        echo "Log file should be $JSMTPD_DIR/log/jsmtpd.log"; 
     65        cd $CDIR 
     66        exit 0; 
     67fi 
     68 
     69if [ "$1" == "stop" ] ;  then 
     70        if [ -f $JSMTPD_DIR/jsmtpd.pid ] ; then 
     71                echo "Stopping Jsmtpd"; 
     72                PID=`cat $JSMTPD_DIR/jsmtpd.pid`; 
     73                rm "$JSMTPD_DIR/jsmtpd.pid" 
     74                kill $PID 
     75                cd $CDIR 
     76                exit 0; 
     77        else 
     78                echo "No pid file ? Is jsmtpd running ?"; 
     79                cd $CDIR 
     80                exit 0; 
     81        fi 
     82fi 
     83