Commit 36990035 authored by Alejandro De Maria Antolinos's avatar Alejandro De Maria Antolinos

Code merged

parents ad401a7b 6c9c300a
......@@ -6,12 +6,13 @@
- [Specific dataset Location](#Specific-dataset-Location)
- [Requirements](#Requirements)
- [Debian 6](#Debian-6)
- [Configuration](#Configuration)
- [Tango](#Tango)
- [Configuration](#configuration)
- [Tango](#tango)
- [Using automatic tool to generate tango properties](#Using-automatic-tool-to-generate-tango-properties)
- [ICAT Reader](#ICAT-Reader)
- [ICAT+](#ICAT)
- [Logging with Graylog](#Logging-with-Graylog)
- [Sum Up](#sum-up)
- [Build](#Build)
- [Packaging](#Packaging)
- [Deploy](#Deploy)
......@@ -174,6 +175,40 @@ MetadataManager can send notifications to ICAT+. For doing so, some parameters n
OBJ_PROPERTY:API_KEY: elogbook-be70ac55-fd08-4840-9b29-b73262958ca8
OBJ_PROPERTY:icatplus_server: "http://lindemaria:8000"
```
### Sum Up
You need to define as class parameters:
Non-Debian6
```
API_KEY: elogbook-be70ac55-fd08-4840-9b29-b73262958ca8
authenticationPlugin: "db"
icatplus_server: "https://icatplus.esrf.fr"
password: "reader"
port: "443"
queueName: "/queue/icatIngest"
queueURLs: bcu-mq-01.esrf.fr:61613,\
bcu-mq-02.esrf.fr:61613
server: "icat.esrf.fr"
username: "reader"
```
For Debian6
```
API_KEY: elogbook-be70ac55-fd08-4840-9b29-b73262958ca8
authenticationPlugin: "db"
icatplus_server: "https://icatplus.esrf.fr:8443"
password: "reader"
port: "443"
queueName: "/queue/icatIngest"
queueURLs: bcu-mq-01.esrf.fr:61613,\
bcu-mq-02.esrf.fr:61613
server: "icat.esrf.fr"
username: "reader"
```
### Logging with Graylog
......
......@@ -5,7 +5,7 @@ from setuptools import setup, find_packages
setup(
name='MetadataManager',
version='4.0.0',
version='4.0.2',
description="ESRF Data Policy metadata manager and meta experiment Tango servers",
# license="",
# author="",
......
......@@ -56,12 +56,12 @@ try:
except ImportError:
graypy = None
class MetaExperiment (tango.Device_5Impl):
class MetaExperiment (tango.LatestDeviceImpl):
"""Metadata for high level experiment"""
def __init__(self, cl, name):
tango.Device_5Impl.__init__(self,cl,name)
tango.LatestDeviceImpl.__init__(self,cl,name)
self.debug_stream("In __init__()")
MetaExperiment.init_device(self)
......@@ -211,7 +211,7 @@ class MetaExperiment (tango.Device_5Impl):
self.Connect()
#----- PROTECTED REGION END -----# // MetaExperiment.State
if argout != tango.DevState.ALARM:
tango.Device_5Impl.dev_state(self)
tango.LatestDeviceImpl.dev_state(self)
return self.get_state()
def dev_status(self):
......@@ -223,7 +223,7 @@ class MetaExperiment (tango.Device_5Impl):
#----- PROTECTED REGION ID(MetadataManager.Status) ENABLED START -----#
self.Connect()
#----- PROTECTED REGION END -----# // MetadataManager.Status
self.__status = tango.Device_5Impl.dev_status(self)
self.__status = tango.LatestDeviceImpl.dev_status(self)
return self.__status
#----- PROTECTED REGION ID(MetaExperiment.programmer_methods) ENABLED START -----#
......
......@@ -87,7 +87,7 @@ from metadata_manager import tangoworker
## RUNNING : Dataset currently recorded
class MetadataManager (tango.Device_5Impl):
class MetadataManager (tango.LatestDeviceImpl):
""""""
def info(self, message):
self.info_stream(message)
......@@ -99,7 +99,7 @@ class MetadataManager (tango.Device_5Impl):
self.error_stream(message)
def __init__(self, cl, name):
tango.Device_5Impl.__init__(self,cl,name)
tango.LatestDeviceImpl.__init__(self,cl,name)
self.metadataWorker = MetadataWorker(self.get_name())
MetadataManager.init_device(self)
......@@ -486,7 +486,7 @@ class MetadataManager (tango.Device_5Impl):
self.Connect()
#----- PROTECTED REGION END -----# // MetadataManager.State
if argout != tango.DevState.ALARM:
tango.Device_5Impl.dev_state(self)
tango.LatestDeviceImpl.dev_state(self)
return self.get_state()
def dev_status(self):
......@@ -498,7 +498,7 @@ class MetadataManager (tango.Device_5Impl):
#----- PROTECTED REGION ID(MetadataManager.Status) ENABLED START -----#
self.Connect()
#----- PROTECTED REGION END -----# // MetadataManager.Status
self.__status = tango.Device_5Impl.dev_status(self)
self.__status = tango.LatestDeviceImpl.dev_status(self)
return self.__status
def IngestTomodbXML(self, argin):
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment