Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't send unnecessary CA config keys #572

Open
smarquard opened this issue Jan 19, 2018 · 3 comments
Open

Don't send unnecessary CA config keys #572

smarquard opened this issue Jan 19, 2018 · 3 comments

Comments

@smarquard
Copy link

smarquard commented Jan 19, 2018

Galicaster includes a lot of config keys that came from an early version of the Matterhorn Reference CA.

Almost all of these are not used by Opencast, and should be left out. See also https://opencast.jira.com/browse/MH-12654

diff --git a/galicaster/opencast/client.py b/galicaster/opencast/client.py
index 3ecc549..44f2b5d 100644
--- a/galicaster/opencast/client.py
+++ b/galicaster/opencast/client.py
@@ -210,31 +210,7 @@ class OCHTTPClient(object):

         client_conf = {
             'service.pid': 'galicaster',
-            'capture.confidence.debug': 'false',
-            'capture.confidence.enable': 'false',
-            'capture.config.remote.polling.interval': self.polling_config,
             'capture.agent.name': self.hostname,
-            'capture.agent.state.remote.polling.interval': self.polling_state,
-            'capture.agent.capabilities.remote.polling.interval': self.polling_caps,
-            'capture.agent.state.remote.endpoint.url': self.server + '/capture-admin/agents',
-            'capture.recording.shutdown.timeout': '60',
-            'capture.recording.state.remote.endpoint.url': self.server + '/capture-admin/recordings',
-            'capture.schedule.event.drop': 'false',
-            'capture.schedule.remote.polling.interval': int(self.polling_schedule)/60,
-            'capture.schedule.event.buffertime': '1',
-            'capture.schedule.remote.endpoint.url': self.server + '/recordings/calendars',
-            'capture.schedule.cache.url': '/opt/opencast/storage/cache/schedule.ics',
-            'capture.ingest.retry.interval': '300',
-            'capture.ingest.retry.limit': '5',
-            'capture.ingest.pause.time': '3600',
-            'capture.cleaner.interval': '3600',
-            'capture.cleaner.maxarchivaldays': '30',
-            'capture.cleaner.mindiskspace': '0',
-            'capture.error.messagebody': '"Capture agent was not running, and was just started."',
-            'capture.error.subject': '"%hostname capture agent started at %date"',
-            'org.opencastproject.server.url': 'http://172.20.209.88:8080',
-            'org.opencastproject.capture.core.url': self.server,
-            'capture.max.length': '28800',
             'capture.device.timezone': get_timezone()
             }
@Alfro
Copy link
Contributor

Alfro commented Jan 22, 2018

We know there are still production environments using older versions than the 4.0 (as far as the 1.4, even). Maybe it would be best if we do not break backwards compatibility, in case those versions of Opencast do require these variables to be set.

We could add a parameter to the [ingest] configuration to enable setting these for older Opencast versions.

@smarquard
Copy link
Author

I don't think they have ever been used.

@Alfro
Copy link
Contributor

Alfro commented Jan 22, 2018

I didn't checked them all, but at least capture.agent.capabilities.remote.polling.interval was used until 2.0.x
I grepped the 1.7.x version with this:

grep -r AGENT_CAPABILITIES_REMOTE_POLLING_INTERVAL modules --exclude="modules/matterhorn-*/node_modules/*"

And got:

Binary file modules/matterhorn-common/target/classes/org/opencastproject/capture/CaptureParameters.class matches
modules/matterhorn-common/src/main/java/org/opencastproject/capture/CaptureParameters.java:  String AGENT_CAPABILITIES_REMOTE_POLLING_INTERVAL = "capture.agent.capabilities.remote.polling.interval";
modules/matterhorn-capture-agent-impl/src/main/java/org/opencastproject/capture/impl/CaptureAgentImpl.java:              .getItem(CaptureParameters.AGENT_CAPABILITIES_REMOTE_POLLING_INTERVAL)) * CaptureParameters.MILLISECONDS;
modules/matterhorn-capture-agent-impl/src/main/java/org/opencastproject/capture/impl/CaptureAgentImpl.java:              CaptureParameters.AGENT_CAPABILITIES_REMOTE_POLLING_INTERVAL);

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants