Problem with log and feed2

diff --git a/Makefile b/Makefile
index 5471bcb24fd7e6d8effac9d3d4bca47f82f4a26c..458c405ab9206fc8dff5c2fbd86990df172c3725 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -129,7 +129,7 @@ dbgsend     :  clean debug
 FEEDPAR        =                                               \
                $(TESTIP)                               \
                $(TESTPORT)                             \
-               ./$(DATATST)/feed*.tst
+               ./$(DATATST)/feed0*.tst
 ONEFEED=feed02.tst
 
 #to test with an external server
@@ -164,7 +164,7 @@ tstfeed     :  debug newtest
           @ rm -fr ./data-queue/*
           @ rm -fr $(TESTDIR)/var/spool/$(APPNAME)/queue/*
           @ bin/feeder                                 \
-                         -c ./conf/feeder.conf.dvl     \
+                         -c ./conf/$(APPNAME).conf.dvl \
                         $(FEEDPAR)
           @ rm -fr ./data-sorter/*
           @ cp -a                                      \

diff --git a/data-feed/feed03.tst b/data-feed/feed03.tst
deleted file mode 100644 (file)
index 36b072b..0000000
--- a/data-feed/feed03.tst
+++ /dev/null
@@ -1,64 +0,0 @@
-#basic test to feed SMTP server
-#====================================================
-# Test language available
-# # comment
-# C: command to execute
-#      GOTLS           - Going in TLS mode
-#      WAIT X          - Stop for X seconds
-#      RESTART         - Restart connection with remote
-#      COMMENT START   - START commenting mode
-#      COMMENT STOP    - STOP commenting mode
-# R: incoming data
-# S: outgoing data
-# T: Test titre or Info
-C:COMMENT START
-#====================================================
-#Please update /etc/hosts with with following
-#start of /etc/host addon
-#----------------------------------------------------
-#Definition to validate mailleur daemon (emlrcvr) server
-#The test serveur itself
-127.127.10.25                   mailleur.example.com    mailleur
-#The example.com email feeder
-127.127.0.1                    feed1.example.com       feed1
-127.127.0.2                    feed2.example.com       feed2
-#remote access
-#127.168.0.1                    no reverss address detection
-127.168.10.1                    foreign1.badserver.tld  foreign1
-#----------------------------------------------------
-#end of /etc/host addon
-#====================================================
-C:COMMENT STOP
-#====================================================
-#starting test 
-T:basic test function
-R:220 mailleur.example.com ESMTP (cleartext) emlrcvr...
-S:EHLO example.com
-R:250-mailleur.example.com, link (cleartext) ready, your IP/FQDN=[127.0.0.1/localhost.localdomain]
-R:250-SIZE 52428800
-R:250-STARTTLS
-R:250-8BITMIME
-R:250-ENHANCEDSTATUSCODES
-R:250-AUTH PLAIN LOGIN
-R:250 HELP
-C:GOTLS
-R:250 Link now encryp...
-S:EHLO example.com
-#R:250-mailleur.example.com, link (crypted) ready, your IP/FQDN=[127.0.0.1/localhost.localdomain]
-R:250-mailleur.example.com, link (crypted) ready, your IP/FQDN...
-R:250-SIZE 52428800
-R:250-8BITMIME
-R:250-ENHANCEDSTATUSCODES
-R:250-AUTH PLAIN LOGIN
-R:250 HELP
-#send a empty ehlo
-S:EHLO
-R:501 5.5.4 syntax error (domain part missing), closing connection.
-R:Disconnected
-#-------------------------------------------------------------------------
-#prepare next test
-#waiting 1 sec
-C:WAIT 1
-#-restarting link
-C:RESTART
-R:220 mailleur.example.com ESMTP (cleartext) emlrcvr...