git.iko.soy/unity8
on xenial help sign in
Adjust the server config
a43d1b6Michal Hruby
tools/registry-tracker.cpp+5−6
compare with xenial
unifiedsplit
@@ -49,15 +49,15 @@ RegistryTracker::~RegistryTracker()
49"Registry.Identity = Registry\n" \
49"Registry.Identity = Registry\n" \
50"Registry.ConfigFile = %1\n" \
50"Registry.ConfigFile = %1\n" \
51"Default.Middleware = Zmq\n" \
51"Default.Middleware = Zmq\n" \
52−"Zmq.ConfigFile = %2\n"
52+"Zmq.ConfigFile = %2\n" \
53+"Smartscopes.Registry.Identity = %3\n"
53
54
54#define REGISTRY_CONFIG \
55#define REGISTRY_CONFIG \
55"[Registry]\n" \
56"[Registry]\n" \
56"Middleware = Zmq\n" \
57"Middleware = Zmq\n" \
57"Zmq.ConfigFile = %1\n" \
58"Zmq.ConfigFile = %1\n" \
58"Scope.InstallDir = %2\n" \
59"Scope.InstallDir = %2\n" \
59−"Scoperunner.Path = %3\n" \
60+"Scoperunner.Path = %3\n"
60−"%4"
61
61
62#define MW_CONFIG \
62#define MW_CONFIG \
63"[Zmq]\n" \
63"[Zmq]\n" \
@@ -107,9 +107,8 @@ void RegistryTracker::runRegistry()
107 return;
107 return;
108 }
108 }
109
109
110− QString runtime_ini = QString(RUNTIME_CONFIG).arg(m_registry_config.fileName()).arg(m_mw_config.fileName());
111 // FIXME: keep in sync with the SSRegistry config
110 // FIXME: keep in sync with the SSRegistry config
112− QString serverRegistryConfig(m_serverScopes ? "SS.Registry.Identity = SSRegistry\n" : "");
111+ QString runtime_ini = QString(RUNTIME_CONFIG).arg(m_registry_config.fileName()).arg(m_mw_config.fileName()).arg(m_serverScopes ? "SSRegistry" : "");
113 if (!m_systemScopes) {
112 if (!m_systemScopes) {
114 m_scopeInstallDir.reset(new QTemporaryDir(tmp.filePath("scopes.XXXXXX")));
113 m_scopeInstallDir.reset(new QTemporaryDir(tmp.filePath("scopes.XXXXXX")));
115 if (!m_scopeInstallDir->isValid()) {
114 if (!m_scopeInstallDir->isValid()) {
@@ -117,7 +116,7 @@ void RegistryTracker::runRegistry()
117 }
116 }
118 scopeInstallDir = m_scopeInstallDir->path();
117 scopeInstallDir = m_scopeInstallDir->path();
119 }
118 }
120− QString registry_ini = QString(REGISTRY_CONFIG).arg(m_mw_config.fileName()).arg(scopeInstallDir).arg(scopeRunnerBin).arg(serverRegistryConfig);
119+ QString registry_ini = QString(REGISTRY_CONFIG).arg(m_mw_config.fileName()).arg(scopeInstallDir).arg(scopeRunnerBin);
121 QString mw_ini = QString(MW_CONFIG).arg(m_endpoints_dir.path());
120 QString mw_ini = QString(MW_CONFIG).arg(m_endpoints_dir.path());
122
121
123 m_runtime_config.write(runtime_ini.toUtf8());
122 m_runtime_config.write(runtime_ini.toUtf8());