Skip to content
This repository was archived by the owner on Nov 9, 2022. It is now read-only.

Commit c54a421

Browse files
RobertSzkutakRobertSzkutak
authored
Merge pull request #785 from grtjn/500-task-host
Fixed #500: linking sample tasks to bootstrap host by default
2 parents c290907 + 3f0a7c4 commit c54a421

File tree

4 files changed

+45
-21
lines changed

4 files changed

+45
-21
lines changed

‎deploy/lib/server_config.rb‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,13 @@ def initialize(options)
112112
else
113113
@qconsole_port = @bootstrap_port
114114
end
115+
116+
begin
117+
r = execute_query %Q{xdmp:host-name()}
118+
@properties["ml.server-name"] = parse_body(r.body)
119+
rescue
120+
logger.warn "WARN: unable to determine MarkLogic Host name of #{@hostname}"
121+
end
115122
end
116123

117124
def get_properties

‎deploy/sample/ml-config.sample.xml‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
<task-start-time>13:00:00-05:00</task-start-time>
3232
<task-database name="${content-db}"/>
3333
<task-modules name="${modules-db}"/>
34-
<task-user name="${app-name}-user"/>
34+
<task-user name="${default-user}"/>
35+
<task-host name="${server-name}"/>
3536
</scheduled-task>
3637
<scheduled-task>
3738
<task-path>/some/hourly-task.xqy</task-path>
@@ -41,7 +42,8 @@
4142
<task-minute>15</task-minute>
4243
<task-database name="${content-db}"/>
4344
<task-modules name="${modules-db}"/>
44-
<task-user name="${app-name}-user"/>
45+
<task-user name="${default-user}"/>
46+
<task-host name="${server-name}"/>
4547
</scheduled-task>
4648
<scheduled-task>
4749
<task-path>/some/minutely-task.xqy</task-path>
@@ -50,7 +52,8 @@
5052
<task-period>3</task-period>
5153
<task-database name="${content-db}"/>
5254
<task-modules name="${modules-db}"/>
53-
<task-user name="${app-name}-user"/>
55+
<task-user name="${default-user}"/>
56+
<task-host name="${server-name}"/>
5457
</scheduled-task>
5558
<scheduled-task>
5659
<task-path>/some/monthly-task.xqy</task-path>
@@ -61,17 +64,18 @@
6164
<task-start-time>13:00:00-05:00</task-start-time>
6265
<task-database name="${content-db}"/>
6366
<task-modules name="${modules-db}"/>
64-
<task-user name="${app-name}-user"/>
67+
<task-user name="${default-user}"/>
68+
<task-host name="${server-name}"/>
6569
</scheduled-task>
6670
<scheduled-task>
6771
<task-path>/some/once-task.xqy</task-path>
6872
<task-root>/</task-root>
6973
<task-type>once</task-type>
70-
<task-period>1</task-period>
7174
<task-start>2019-01-01T13:00:00-05:00</task-start>
7275
<task-database name="${content-db}"/>
7376
<task-modules name="${modules-db}"/>
74-
<task-user name="${app-name}-user"/>
77+
<task-user name="${default-user}"/>
78+
<task-host name="${server-name}"/>
7579
</scheduled-task>
7680
<scheduled-task>
7781
<task-path>/some/weekly-task.xqy</task-path>
@@ -86,7 +90,8 @@
8690
<task-start-time>13:00:00-05:00</task-start-time>
8791
<task-database name="${content-db}"/>
8892
<task-modules name="${modules-db}"/>
89-
<task-user name="${app-name}-user"/>
93+
<task-user name="${default-user}"/>
94+
<task-host name="${server-name}"/>
9095
</scheduled-task>
9196
</scheduled-tasks>
9297
</task-server>
@@ -530,8 +535,8 @@
530535
</roles>
531536
<users xmlns="http://marklogic.com/xdmp/security">
532537
<user>
533-
<user-name>${app-name}-user</user-name>
534-
<description>A user for the ${app-name} application</description>
538+
<user-name>${default-user}</user-name>
539+
<description>The default user for the ${app-name} application</description>
535540
<password>${appuser-password}</password>
536541
<role-names>
537542
<role-name>${app-role}</role-name>

‎deploy/test/data/ml7-config-changed.xml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
<task-start-time>13:00:00-05:00</task-start-time>
2121
<task-database name="@ml.content-db"/>
2222
<task-modules name="@ml.modules-db"/>
23-
<task-user name="@ml.app-name-user"/>
23+
<task-user name="${default-user}"/>
24+
<task-host name="${server-name}"/>
2425
</scheduled-task>
2526
<scheduled-task>
2627
<task-path>/some/hourly-task.xqy</task-path>
@@ -30,7 +31,8 @@
3031
<task-minute>15</task-minute>
3132
<task-database name="@ml.content-db"/>
3233
<task-modules name="@ml.modules-db"/>
33-
<task-user name="@ml.app-name-user"/>
34+
<task-user name="${default-user}"/>
35+
<task-host name="${server-name}"/>
3436
</scheduled-task>
3537
<scheduled-task>
3638
<task-path>/some/minutely-task.xqy</task-path>
@@ -39,7 +41,8 @@
3941
<task-period>3</task-period>
4042
<task-database name="@ml.content-db"/>
4143
<task-modules name="@ml.modules-db"/>
42-
<task-user name="@ml.app-name-user"/>
44+
<task-user name="${default-user}"/>
45+
<task-host name="${server-name}"/>
4346
</scheduled-task>
4447
<scheduled-task>
4548
<task-path>/some/monthly-task.xqy</task-path>
@@ -50,7 +53,8 @@
5053
<task-start-time>13:00:00-05:00</task-start-time>
5154
<task-database name="@ml.content-db"/>
5255
<task-modules name="@ml.modules-db"/>
53-
<task-user name="@ml.app-name-user"/>
56+
<task-user name="${default-user}"/>
57+
<task-host name="${server-name}"/>
5458
</scheduled-task>
5559
<scheduled-task>
5660
<task-path>/some/once-task.xqy</task-path>
@@ -59,7 +63,8 @@
5963
<task-start>2019-01-01T13:00:00-05:00</task-start>
6064
<task-database name="@ml.content-db"/>
6165
<task-modules name="@ml.modules-db"/>
62-
<task-user name="@ml.app-name-user"/>
66+
<task-user name="${default-user}"/>
67+
<task-host name="${server-name}"/>
6368
</scheduled-task>
6469
<scheduled-task>
6570
<task-path>/some/weekly-task.xqy</task-path>
@@ -74,7 +79,8 @@
7479
<task-start-time>13:00:00-05:00</task-start-time>
7580
<task-database name="@ml.content-db"/>
7681
<task-modules name="@ml.modules-db"/>
77-
<task-user name="@ml.app-name-user"/>
82+
<task-user name="${default-user}"/>
83+
<task-host name="${server-name}"/>
7884
</scheduled-task>
7985
</scheduled-tasks>
8086
</task-server>

‎deploy/test/data/ml7-config.xml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
<task-start-time>13:00:00-05:00</task-start-time>
2121
<task-database name="@ml.content-db"/>
2222
<task-modules name="@ml.modules-db"/>
23-
<task-user name="@ml.app-name-user"/>
23+
<task-user name="${default-user}"/>
24+
<task-host name="${server-name}"/>
2425
</scheduled-task>
2526
<scheduled-task>
2627
<task-path>/some/hourly-task.xqy</task-path>
@@ -30,7 +31,8 @@
3031
<task-minute>15</task-minute>
3132
<task-database name="@ml.content-db"/>
3233
<task-modules name="@ml.modules-db"/>
33-
<task-user name="@ml.app-name-user"/>
34+
<task-user name="${default-user}"/>
35+
<task-host name="${server-name}"/>
3436
</scheduled-task>
3537
<scheduled-task>
3638
<task-path>/some/minutely-task.xqy</task-path>
@@ -39,7 +41,8 @@
3941
<task-period>3</task-period>
4042
<task-database name="@ml.content-db"/>
4143
<task-modules name="@ml.modules-db"/>
42-
<task-user name="@ml.app-name-user"/>
44+
<task-user name="${default-user}"/>
45+
<task-host name="${server-name}"/>
4346
</scheduled-task>
4447
<scheduled-task>
4548
<task-path>/some/monthly-task.xqy</task-path>
@@ -50,7 +53,8 @@
5053
<task-start-time>13:00:00-05:00</task-start-time>
5154
<task-database name="@ml.content-db"/>
5255
<task-modules name="@ml.modules-db"/>
53-
<task-user name="@ml.app-name-user"/>
56+
<task-user name="${default-user}"/>
57+
<task-host name="${server-name}"/>
5458
</scheduled-task>
5559
<scheduled-task>
5660
<task-path>/some/once-task.xqy</task-path>
@@ -59,7 +63,8 @@
5963
<task-start>2019-01-01T13:00:00-05:00</task-start>
6064
<task-database name="@ml.content-db"/>
6165
<task-modules name="@ml.modules-db"/>
62-
<task-user name="@ml.app-name-user"/>
66+
<task-user name="${default-user}"/>
67+
<task-host name="${server-name}"/>
6368
</scheduled-task>
6469
<scheduled-task>
6570
<task-path>/some/weekly-task.xqy</task-path>
@@ -74,7 +79,8 @@
7479
<task-start-time>13:00:00-05:00</task-start-time>
7580
<task-database name="@ml.content-db"/>
7681
<task-modules name="@ml.modules-db"/>
77-
<task-user name="@ml.app-name-user"/>
82+
<task-user name="${default-user}"/>
83+
<task-host name="${server-name}"/>
7884
</scheduled-task>
7985
</scheduled-tasks>
8086
</task-server>

0 commit comments

Comments
 (0)