Changeset 47 for trunk/tool

Show
Ignore:
Timestamp:
08/30/07 17:46:34 (15 years ago)
Author:
andreu
Message:

merge from tag REL-0.0.11beta

Location:
trunk/tool
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • trunk/tool/check.sh

    r36 r47  
    1111  killall renetcolAgg 
    1212  sleep 1 
    13   /home/maintenance/renetcol-0.0.9/src/renetcolMsgCtl /home/maintenance/renetcol-0.0.9/src/renetcol 
     13  /home/maintenance/renetcol-0.0.11beta/src/renetcolMsgCtl /home/maintenance/renetcol-0.0.11beta/src/renetcol 
    1414  echo "renetcolMsgCtl started" 
    1515  sleep 2 
    16   /home/maintenance/renetcol-0.0.9/src/renetcol /home/maintenance/renetcol-0.0.9/src/info_routeur_netflow.txt /home/maintenance/renetcol-0.0.9/src/donneesblocsadresses2 /home/maintenance/renetcol-0.0.9/src/rules.txt 
     16  /home/maintenance/renetcol-0.0.11beta/src/renetcol /home/maintenance/renetcol-0.0.11beta/src/info_routeur_netflow.txt /home/maintenance/renetcol-0.0.11beta/src/donneesblocsadresses2 /home/maintenance/renetcol-0.0.11beta/src/rules.txt 
    1717  echo "renetcol restarted" 
    18   /home/maintenance/renetcol-0.0.9/src/renetcolSender /home/maintenance/renetcol-0.0.9/src/renetcol 1 /home/maintenance/renetcol-0.0.9/src/rules.txt 
     18  /home/maintenance/renetcol-0.0.11beta/src/renetcolSender /home/maintenance/renetcol-0.0.11beta/src/renetcol 1 /home/maintenance/renetcol-0.0.11beta/src/rules.txt 
    1919  echo "renetcolSender restarted" 
    20   /home/maintenance/renetcol-0.0.9/src/renetcolAgg 
     20  /home/maintenance/renetcol-0.0.11beta/src/renetcolAgg 
    2121else 
    2222  echo "All is up" 
  • trunk/tool/renetcolGUI_0_0_7.py

    r36 r47  
    170170        underscore_line = "" 
    171171        flowCpt+=1 
    172         if (flowCpt%20 == 0 or oldTpl != self.flow[0]): 
     172##        if (flowCpt%20 == 0 or oldTpl != self.flow[0]): 
     173        if (flowCpt%100 == 0):  
    173174            flowCpt = 0 
    174175            for i in range (0, len(tpl_def[self.flow[0]])):