Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r2209 - in branches/XML-LS-RELEASE-1.1: ant ant/rrdma ant/sqlma ant/xmlls contrib/FlowMP-client contrib/FlowMP-client/schemas contrib/FlowMP-manager schema

Subject: perfsonar development work

List archive

perfsonar: r2209 - in branches/XML-LS-RELEASE-1.1: ant ant/rrdma ant/sqlma ant/xmlls contrib/FlowMP-client contrib/FlowMP-client/schemas contrib/FlowMP-manager schema


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r2209 - in branches/XML-LS-RELEASE-1.1: ant ant/rrdma ant/sqlma ant/xmlls contrib/FlowMP-client contrib/FlowMP-client/schemas contrib/FlowMP-manager schema
  • Date: Fri, 9 Mar 2007 10:07:36 -0500
Author: mac
Date: 2007-03-09 10:07:35 -0500 (Fri, 09 Mar 2007)
New Revision: 2209

Added:
branches/XML-LS-RELEASE-1.1/contrib/FlowMP-manager/filter.py
Removed:
branches/XML-LS-RELEASE-1.1/contrib/FlowMP-manager/process.log
Modified:
branches/XML-LS-RELEASE-1.1/ant/configure-targets.xml
branches/XML-LS-RELEASE-1.1/ant/pre-install-targets.xml
branches/XML-LS-RELEASE-1.1/ant/rrdma/rrdma-configure-targets.xml
branches/XML-LS-RELEASE-1.1/ant/sqlma/sqlma-configure-targets.xml
branches/XML-LS-RELEASE-1.1/ant/xmlls/configure-targets.xml
branches/XML-LS-RELEASE-1.1/ant/xmlls/pre-install-targets.xml
branches/XML-LS-RELEASE-1.1/ant/xmlls/release-targets.xml
branches/XML-LS-RELEASE-1.1/contrib/FlowMP-client/config.py
branches/XML-LS-RELEASE-1.1/contrib/FlowMP-client/flowmpclient.py
branches/XML-LS-RELEASE-1.1/contrib/FlowMP-client/schemas/subscribe.xml
branches/XML-LS-RELEASE-1.1/contrib/FlowMP-manager/common.py
branches/XML-LS-RELEASE-1.1/contrib/FlowMP-manager/config.py
branches/XML-LS-RELEASE-1.1/contrib/FlowMP-manager/manager.py
branches/XML-LS-RELEASE-1.1/schema/
Log:
merge from trunk




Modified: branches/XML-LS-RELEASE-1.1/ant/configure-targets.xml
===================================================================
--- branches/XML-LS-RELEASE-1.1/ant/configure-targets.xml 2007-03-09
14:57:45 UTC (rev 2208)
+++ branches/XML-LS-RELEASE-1.1/ant/configure-targets.xml 2007-03-09
15:07:35 UTC (rev 2209)
@@ -72,6 +72,9 @@
addproperty="functionality.register.interval"
defaultvalue="30000"/>

+ <input message="Enter IP or DNS address of the host you are using now
to deploy the service []:"
+ addproperty="functionality.register.access_point"/>
+
<input message="Enter the descirption of service that will be send
to the LS [perfSONAR service]:"
addproperty="functionality.register.description"
defaultvalue="perfSONAR service"/>
@@ -79,7 +82,7 @@
<propertyfile file="conf/service.properties"
comment="This file was created by the Ant configuration script.">

- <entry key="service.r.access_point"
value="http://${target.server}:${target.port}/${deploy.root}/services/${webservice.name}"/>
+ <entry key="service.r.access_point"
value="http://${functionality.register.access_point}:${target.port}/${deploy.root}/services/${webservice.name}"/>
<entry key="service.r.service_description"
value="${functionality.register.description}"/>
<entry key="service.r.ls_url"
value="${functionality.register.ls_address}"/>
<entry key="component.registrator.interval"
value="${functionality.register.interval}"/>

Modified: branches/XML-LS-RELEASE-1.1/ant/pre-install-targets.xml
===================================================================
--- branches/XML-LS-RELEASE-1.1/ant/pre-install-targets.xml 2007-03-09
14:57:45 UTC (rev 2208)
+++ branches/XML-LS-RELEASE-1.1/ant/pre-install-targets.xml 2007-03-09
15:07:35 UTC (rev 2209)
@@ -251,7 +251,7 @@

<!-- getting the server address -->

-
+<!--
<target name="get-server-address">

<input message="Enter the address (ip or hostname) of your
application server Tomcat [localhost]:"
@@ -267,8 +267,20 @@
</propertyfile>

</target>
+-->

+ <target name="get-server-address">

+ <propertyfile file="ant/const.properties"
+ comment="This file was created by the Ant configuration script.">
+
+ <entry key="target.server" value="127.0.0.1"/>
+
+ </propertyfile>
+
+ </target>
+
+
<!-- getting the server port -->



Modified: branches/XML-LS-RELEASE-1.1/ant/rrdma/rrdma-configure-targets.xml
===================================================================
--- branches/XML-LS-RELEASE-1.1/ant/rrdma/rrdma-configure-targets.xml
2007-03-09 14:57:45 UTC (rev 2208)
+++ branches/XML-LS-RELEASE-1.1/ant/rrdma/rrdma-configure-targets.xml
2007-03-09 15:07:35 UTC (rev 2209)
@@ -94,7 +94,6 @@
comment="This file was created by the Ant
configuration script.">

<entry key="service.r.type" value="ma"/>
- <entry key="service.r.access_point"
value="http://${target.server}:${target.port}/${deploy.root}/services/${webservice.name}"/>
<entry key="service.r.service_name" value="Java RRD MA"/>
<entry key="service.r.service_type" value="RRD MA"/>
<entry key="service.r.service_description" value="Java RRD MA,
perfSONAR project"/>

Modified: branches/XML-LS-RELEASE-1.1/ant/sqlma/sqlma-configure-targets.xml
===================================================================
--- branches/XML-LS-RELEASE-1.1/ant/sqlma/sqlma-configure-targets.xml
2007-03-09 14:57:45 UTC (rev 2208)
+++ branches/XML-LS-RELEASE-1.1/ant/sqlma/sqlma-configure-targets.xml
2007-03-09 15:07:35 UTC (rev 2209)
@@ -98,7 +98,6 @@
comment="This file was created by the Ant
configuration script.">

<entry key="service.r.type" value="ma"/>
- <entry key="service.r.access_point"
value="http://${target.server}:${target.port}/${deploy.root}/services/${webservice.name}"/>
<entry key="service.r.service_name" value="Java SQL MA"/>
<entry key="service.r.service_type" value="SQL MA"/>
<entry key="service.r.service_description" value="Java SQL MA,
perfSONAR project"/>

Modified: branches/XML-LS-RELEASE-1.1/ant/xmlls/configure-targets.xml
===================================================================
--- branches/XML-LS-RELEASE-1.1/ant/xmlls/configure-targets.xml 2007-03-09
14:57:45 UTC (rev 2208)
+++ branches/XML-LS-RELEASE-1.1/ant/xmlls/configure-targets.xml 2007-03-09
15:07:35 UTC (rev 2209)
@@ -40,31 +40,48 @@
<echo message="1. Service configuration"/>
<echo message="=========================="/>
<echo/>
+ <echo>All parameters here were set automatically</echo>

<property name="default_in.log4j_properties"

value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/log4j.properties"/>
+ <property name="in.log4j_properties"
value="${default_in.log4j_properties}" />
+ <!--
<input message="Enter log configuration file
[${default_in.log4j_properties}]"
addproperty="in.log4j_properties"
defaultvalue="${default_in.log4j_properties}" />
+ -->

<property name="default_in.logs_dir"
value="${service.home}/${deploy.root}/log"/>
+ <property name="in.logs_dir" value="${default_in.logs_dir}" />
+
+ <!--
<input message="Enter logs directory [${default_in.logs_dir}]"
addproperty="in.logs_dir"
defaultvalue="${default_in.logs_dir}" />
+ -->

<property name="default_in.sax_parser_config"

value="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf/objects.config"/>
+ <property name="in.sax_parser_config"
value="${default_in.sax_parser_config}"/>
+ <!--
<input message="Enter path for parser configuration file
[${default_in.sax_parser_config}]"
addproperty="in.sax_parser_config"
defaultvalue="${default_in.sax_parser_config}" />
+ -->

<echo/>
<echo message="2. Lookup Information configuration"/>
<echo message="====================================="/>
<echo/>

- <property name="default_in.r_access_point"
value="http://${target.server}:8080/${deploy.root}"/>
+ <property name="default_in.hostname"
value="mycomputer.mydomain.com"/>
+ <input message="Enter hostname and domainname of your machine. Not
localhost. [${default_in.hostname}]"
+ addproperty="in.hostname"
+ defaultvalue="${default_in.hostname}" />
+
+
+ <property name="default_in.r_access_point"
value="http://${in.hostname}:8080/${deploy.root}"/>
<input message="Lookup Information of service -- access point (URL)
[${default_in.r_access_point}]"
addproperty="in.r_access_point"
defaultvalue="${default_in.r_access_point}" />

Modified: branches/XML-LS-RELEASE-1.1/ant/xmlls/pre-install-targets.xml
===================================================================
--- branches/XML-LS-RELEASE-1.1/ant/xmlls/pre-install-targets.xml
2007-03-09 14:57:45 UTC (rev 2208)
+++ branches/XML-LS-RELEASE-1.1/ant/xmlls/pre-install-targets.xml
2007-03-09 15:07:35 UTC (rev 2209)
@@ -3,7 +3,7 @@


<target name="pre-install"
- depends="show-info,
+ depends="show-info,
get-inputs,
confirm-inputs,
get-tomcat,
@@ -12,32 +12,41 @@
</target>


+ <!-- Official Tomcat -->

- <!--property name="tomcat.download.url"
-
value="http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.20/bin/apache-tomcat-5.5.20.tar.gz";
/-->
<property name="tomcat.download.url"
-
value="http://monstera.man.poznan.pl/private/bak/apache-tomcat-5.5.20.tar.gz";
/>
+
value="http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.20/bin/apache-tomcat-5.5.20.tar.gz";
/>
+
+
<!-- property name="tomcat.download.url"
+
value="http://monstera.man.poznan.pl/private/bak/apache-tomcat-5.5.20.tar.gz";
/-->
+ <!-- property name="tomcat.download.url"
value="http://monstera.man.poznan.pl/tomcat.tar.gz"; /-->

<property name="tomcat.tempfile" value="apache-tomcat-5.5.20"/> <!--
without .tar.gz -->

+ <property environment="env"/> <!-- env variables -->
+
<target name="show-info">
<echo>Pre-install</echo>
- <echo/>
+ <echo/>
<echo>---- Welcome in perfSONAR LookupService installation script
----</echo>
- <echo/>
- <echo>You're about to install LookupService that may be also called
LS during the installation process. The installation guide is accessible on
http://wiki.perfsonar.net/jra1-wiki/index.php/Installation_LS_1.1#Lookup_service_installation
web page</echo>
- <echo/>
- <echo>Requirements:</echo>
- <echo/>
- <echo> 1. Java 1.5.x</echo>
- <echo> 2. Ant 1.6.x (we're sure you've already got it installed as
you run the installation process)</echo>
- <echo> 3. eXist DB XML - see Exist DB Installation Guide for
LS:</echo>
- <echo>
http://wiki.perfsonar.net/jra1-wiki/index.php/Exist_DB_Installation_Guide_for_LS</echo>
- <echo> 4. JAVA_HOME environment variable set to your Java
directory</echo>
- <echo/>
- <input message="Do you want to proceed? Just press ENTER to continue.
Otherwise CTRL-C stops the process immediately"/>
+ <echo/>
+ <echo>You're about to install LookupService that may be also called
LS during the installation process.</echo>
+ <!--
+ <echo>The installation guide is accessible on
http://wiki.perfsonar.net/jra1-wiki/index.php/Installation_LS_1.1#Lookup_service_installation
web page</echo>
+ -->
+ <echo/>
+ <echo>Requirements:</echo>
+ <echo/>
+ <echo> 1. Java 1.5.x</echo>
+ <echo> 2. Ant 1.6.x (we're sure you've already got it installed as
you run the installation process)</echo>
+ <echo> 3. eXist DB XML - see Exist DB Installation Guide for
LS:</echo>
+ <echo>
http://wiki.perfsonar.net/jra1-wiki/index.php/Exist_DB_Installation_Guide_for_LS</echo>
+ <echo> 4. JAVA_HOME environment variable set to your Java
directory</echo>
+ <echo> Now, your JAVA_HOME is [${env.JAVA_HOME}]</echo>
+ <echo/>
+ <input message="Do you want to proceed? Just press ENTER to
continue. Otherwise CTRL-C stops the process immediately"/>

<echo>Preparing the installation of XML Lookup Service...</echo>
<echo></echo>
@@ -50,7 +59,7 @@
<target name="get-inputs">
<!-- tomcat -->

- <input message="Do you want to install Tomcat webserver?"
+ <input message="Do you want to download Tomcat webserver
automatically (say N if you've already got Tomcat)?"
addproperty="tomcat.install.answer"
validargs="y,n"
defaultvalue="n"/>
@@ -61,34 +70,51 @@
</condition>

<property name="default_tomcat.home" value="/usr/local/tomcat_ls"/>
- <input message="Enter webserver home directory
[${default_tomcat.home}]"
+ <input message="Enter webserver (Tomcat) home directory. If answered
Y for previous question, this directory will be the target directory where to
install Tomcat. If answered N, Tomcat will be installed there
[${default_tomcat.home}]"
addproperty="tomcat.home"
defaultvalue="${default_tomcat.home}" />

- <property name="default_tomcat.tempdir" value="/tmp"/>
- <input message="Temporary directory [${default_tomcat.tempdir}]?"
- addproperty="tomcat.tempdir"
- defaultvalue="${default_tomcat.tempdir}"/>

+ <property name="default_tomcat.tempdir" value="${basedir}/tmp"/>
+ <!--
+ <input message="Temporary directory [${default_tomcat.tempdir}]?"
+ addproperty="tomcat.tempdir"
+ defaultvalue="${default_tomcat.tempdir}"/>
+ -->
+ <property name="tomcat.tempdir" value="${default_tomcat.tempdir}"
/><!-- don't ask for tmp -->

+ <!--
<property name="default_hostname" value="localhost"/>
<input message="Enter webserver hostname (please type your host and
domain name - not localhost)"
addproperty="target.server"
defaultvalue="${default_hostname}" />
+ -->
+ <property name="target.server" value="127.0.0.1"/> <!-- localhost to
avoid use AdminClient on remote host; it fails if not enabled in tomcat
configuration -->

<property name="default_target.port" value="8080"/>
<input message="Enter webserver port [${default_target.port}]"
addproperty="target.port"
defaultvalue="${default_target.port}" />

- <property name="default_service.home" value="${basedir}"/>
- <input message="Enter service directory (where to be installed)
[${default_service.home}]"
+ <!-- directories -->
+
+ <dirname property="basedirUp" file="${basedir}" /> <!-- ../ -->
+ <dirname property="basedirUpUp" file="${basedirUp}" /> <!-- ../../
-->
+ <basename property="owndir" file="${basedirUp}" /> <!--
XML-LS-v.w(-RCx) -->
+
+ <property name="default_in.deploy.root" value="${owndir}"/>
+ <property name="deploy.root" value="${default_in.deploy.root}"/>
<!-- don't ask for deploy root -->
+ <!--
+ <input message="Enter service deployment name
[${default_in.deploy.root}]"
+ addproperty="deploy.root"
+ defaultvalue="${default_in.deploy.root}" />
+ -->
+
+ <property name="default_service.home"
value="${basedirUpUp}/webapps"/>
+ <input message="Service directory is suffix is [${deploy.root}].
Enter service prefix directory (where target directory ${deploy.root} will be
installed) Default is [${default_service.home}]"
addproperty="service.home"
defaultvalue="${default_service.home}" />

- <property name="default_in.deploy.root" value="LookupService"/>
- <input message="Enter service deployment name
[${default_in.deploy.root}]"
- addproperty="deploy.root"
- defaultvalue="${default_in.deploy.root}" />
+
</target>

<target name="confirm-inputs">
@@ -96,8 +122,9 @@
<echo message="Your settings: "/>
<echo
message="---------------------------------------------------------------"/>

- <echo message="Tomcat home directory [${tomcat.home}]" />
- <echo message="Service address
[http://${target.server}:${target.port}/${deploy.root}]"/>
+ <echo message="Tomcat home directory: [${tomcat.home}]" />
+ <echo message="Tomcat address:
[http://${target.server}:${target.port}/${deploy.root}]"/>
+ <echo message="Service destination directory:
[${service.home}/${deploy.root}]"/>

<input message="Proceed with these settings? "
validargs="y,n"
@@ -114,8 +141,8 @@

<echo>Download Tomcat</echo>
<property name="tomcat.tar"
value="${tomcat.tempdir}/${tomcat.tempfile}.tar.gz"/>
-
- <mkdir dir="${tomcat.tempdir}"/>
+
+ <mkdir dir="${tomcat.tempdir}"/>
<get src="${tomcat.download.url}"
dest="${tomcat.tar}"
verbose="true"

Modified: branches/XML-LS-RELEASE-1.1/ant/xmlls/release-targets.xml
===================================================================
--- branches/XML-LS-RELEASE-1.1/ant/xmlls/release-targets.xml 2007-03-09
14:57:45 UTC (rev 2208)
+++ branches/XML-LS-RELEASE-1.1/ant/xmlls/release-targets.xml 2007-03-09
15:07:35 UTC (rev 2209)
@@ -19,14 +19,15 @@

<target name="ask-for-values">

- <property name="release-file" value="perfSONAR-XML-LS"/>
+ <property name="release-file" value="perfSONAR-XML-LS"/> <!-- tar gz
file prefix -->
+ <property name="release-srcdir" value="XML-LS"/> <!-- root
directory of tar gz content -->

<property name="default_release-number" value="1.1-RC1"/>
- <input addproperty="release-number" message="Enter release number
[${default_release-number}" defaultvalue="${default_release-number}"/>
+ <input addproperty="release-number" message="Enter release number
[${default_release-number}]" defaultvalue="${default_release-number}"/>

- <property name="release-dir"
value="${basedir}/release/${release-file}-${release-number}/perfsonar"/> <!--
$BASEDIR/release/perfSONAR-XML-LS-1.1/perfsonar-->
+ <property name="release-dir"
value="${basedir}/release/${release-srcdir}-${release-number}/perfsonar"/>
<!-- $BASEDIR/release/XML-LS-1.1/perfsonar-->

- <echo>Path for release is: [${release-dir}]</echo>
+ <echo>Path for release is: [${release-dir}]</echo>
<echo>Release file is:
[${release-file}-${release-number}.tar.gz]</echo>



Modified: branches/XML-LS-RELEASE-1.1/contrib/FlowMP-client/config.py
===================================================================
--- branches/XML-LS-RELEASE-1.1/contrib/FlowMP-client/config.py 2007-03-09
14:57:45 UTC (rev 2208)
+++ branches/XML-LS-RELEASE-1.1/contrib/FlowMP-client/config.py 2007-03-09
15:07:35 UTC (rev 2209)
@@ -9,21 +9,21 @@
serviceurl="http://%s:%s%s"; % (serveraddress, serverport, servicepath)

# where do you want to receive your data
-clientaddress="85.144.164.154"
-clientport="2099"
+clientaddress="192.87.102.208"
+clientport="7777"

# where is your zebedee binary
-zebedee="/usr/bin/zebedee"
+zebedee="/usr/local/bin/zebedee"

# keepalive interval
keepalive=60

# currently only one router at a time is supported
# surfnet: trillian / ford / zaphod / arthur
-router="zaphod"
+router="ford"

-# not yet implemented
-filter=""
+# string to filter flow data
+filter="i'm a evil string"

# not yet implemented
# flow version (netflow_v9 / netflow_v5 / sflow)
@@ -31,5 +31,5 @@


# loglevel (info, debug, warning or error)
-loglevel="info"
+loglevel="debug"


Modified: branches/XML-LS-RELEASE-1.1/contrib/FlowMP-client/flowmpclient.py
===================================================================
--- branches/XML-LS-RELEASE-1.1/contrib/FlowMP-client/flowmpclient.py
2007-03-09 14:57:45 UTC (rev 2208)
+++ branches/XML-LS-RELEASE-1.1/contrib/FlowMP-client/flowmpclient.py
2007-03-09 15:07:35 UTC (rev 2209)
@@ -36,6 +36,7 @@
req = req.replace("{clientaddress}", config.clientaddress)
req = req.replace("{clientport}", config.clientport)
req = req.replace("{router}", config.router)
+ req = req.replace("{filter}", config.filter)
logging.debug("using url %s" % config.serviceurl)
response = self.soapClient.sendSOAP(config.serviceurl, req)
if not response:
@@ -69,7 +70,7 @@

def keepAlive(self):
"""send keepalive to netflow MP"""
- logging.info("sending keepalive to service")
+ logging.debug("sending keepalive to service")
if not self.clientID:
logging.warning("can't sent keepalive, got no clientID")
return False

Modified:
branches/XML-LS-RELEASE-1.1/contrib/FlowMP-client/schemas/subscribe.xml
===================================================================
--- branches/XML-LS-RELEASE-1.1/contrib/FlowMP-client/schemas/subscribe.xml
2007-03-09 14:57:45 UTC (rev 2208)
+++ branches/XML-LS-RELEASE-1.1/contrib/FlowMP-client/schemas/subscribe.xml
2007-03-09 15:07:35 UTC (rev 2209)
@@ -7,7 +7,7 @@
<nmwg:metadata id="md1">
<netflow:parameters id="someid">
<nmwg:parameter name="anonymizationLevel">1</nmwg:parameter>
- <nmwg:parameter name="filter"></nmwg:parameter>
+ <nmwg:parameter name="filter">{filter}</nmwg:parameter>
<nmwg:parameter name="netflowVersion">netflow_v9</nmwg:parameter>
<nmwg:parameter name="transportProtocol">udp</nmwg:parameter>
</netflow:parameters>

Modified: branches/XML-LS-RELEASE-1.1/contrib/FlowMP-manager/common.py
===================================================================
--- branches/XML-LS-RELEASE-1.1/contrib/FlowMP-manager/common.py
2007-03-09 14:57:45 UTC (rev 2208)
+++ branches/XML-LS-RELEASE-1.1/contrib/FlowMP-manager/common.py
2007-03-09 15:07:35 UTC (rev 2209)
@@ -1,21 +1,24 @@

import os
import logging
+from elementtree.ElementTree import ElementTree

logging.basicConfig(level=logging.DEBUG,
format='%(asctime)s %(levelname)s %(message)s',
filename='process.log',
filemode='a')

-from elementtree.ElementTree import ElementTree
+import config
+import filter

-import config
+

+fc = filter.FilterChecker()

class Client:
def __init__(self, address=None, port=None, routers=[], filter=None, \
netflow=None, transport=None, zebedeePid=None,
- lastKeepAlive=None, id=None ):
+ lastKeepAlive=None, id=None, key=None ):
self.id = id
self.address = address
self.port = port
@@ -25,6 +28,7 @@
self.transport = transport
self.zebedeePid = zebedeePid
self.lastKeepAlive = lastKeepAlive
+ self.key = key


def readClients():
@@ -46,11 +50,18 @@
root.find('routers').findall('router')]

f = root.find('filter').text
- if f and f.strip(): client.filter = f.strip()
- else: client.filter = None
+ # check if there is a filter, and if it is okay
+ if f and f.strip():
+ if fc.check(f):
+ client.filter = f.strip()
+ else:
+ logging.warning("evil filter defined!!!")
+ else:
+ client.filter = None
+
client.flow = root.find('netflowVersion').text.strip()
client.transport = root.find('transportProtocol').text.strip()
- #client.zebedeePid = root.find('zebedee-pid').text.strip()
+ client.key = root.find('anonymizingkey').text.strip()

clients.append(client)


Modified: branches/XML-LS-RELEASE-1.1/contrib/FlowMP-manager/config.py
===================================================================
--- branches/XML-LS-RELEASE-1.1/contrib/FlowMP-manager/config.py
2007-03-09 14:57:45 UTC (rev 2208)
+++ branches/XML-LS-RELEASE-1.1/contrib/FlowMP-manager/config.py
2007-03-09 15:07:35 UTC (rev 2209)
@@ -1,6 +1,6 @@
#!/usr/bin/env python

-propFile =
"/usr/local/gijs/tomcat/webapps/perfSONAR-FLOWMP-1.1-beta/WEB-INF/classes/perfsonar/conf/service.properties"
+propFile =
"/usr/local/FlowSubscriptionMP/tomcat/webapps/perfSONAR-FLOWMP-1.1-beta/WEB-INF/classes/perfsonar/conf/service.properties"

import re
import sys

Copied: branches/XML-LS-RELEASE-1.1/contrib/FlowMP-manager/filter.py (from
rev 2207, trunk/perfsonar/contrib/FlowMP-manager/filter.py)

Modified: branches/XML-LS-RELEASE-1.1/contrib/FlowMP-manager/manager.py
===================================================================
--- branches/XML-LS-RELEASE-1.1/contrib/FlowMP-manager/manager.py
2007-03-09 14:57:45 UTC (rev 2208)
+++ branches/XML-LS-RELEASE-1.1/contrib/FlowMP-manager/manager.py
2007-03-09 15:07:35 UTC (rev 2209)
@@ -72,9 +72,13 @@
pFile = open(os.path.join(runDir, pid))
pNum = int(pFile.readline().strip())
logging.info("kill " + str(pNum))
- os.kill(pNum, signal.SIGTERM)
+ try:
+ os.kill(pNum, signal.SIGTERM)
+ except OSError, err:
+ logging.error(err)


+
def main():
try:
opts, args = getopt.getopt(sys.argv[1:], "hsq", ["help", "start",
"stop"])

Deleted: branches/XML-LS-RELEASE-1.1/contrib/FlowMP-manager/process.log


Property changes on: branches/XML-LS-RELEASE-1.1/schema
___________________________________________________________________
Name: svn:externals
+ nmwg http://anonsvn.internet2.edu/svn/nmwg/trunk/nmwg/schema/



  • perfsonar: r2209 - in branches/XML-LS-RELEASE-1.1: ant ant/rrdma ant/sqlma ant/xmlls contrib/FlowMP-client contrib/FlowMP-client/schemas contrib/FlowMP-manager schema, svnlog, 03/09/2007

Archive powered by MHonArc 2.6.16.

Top of Page