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.

Sign up for GitHub

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

Update czmq4 branch with recent changes from master #36

Merged
merged 11 commits into from
May 26, 2017
Merged

Update czmq4 branch with recent changes from master #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
18c91cb
Remember to gitignore CMake files
jimklimov Apr 6, 2017
5139597
Problem: fix naming and tmpfiles config
jimklimov Apr 10, 2017
a288b49
Standardize on FTY systemd service template
jimklimov Apr 10, 2017
53a6b89
Merge pull request #33 from jimklimov/fixup-cosmetic
jana-rapava Apr 10, 2017
a0b1452
Merge pull request #34 from jimklimov/master
Apr 11, 2017
60734b2
Problem: fix naming and tmpfiles config
jimklimov Apr 10, 2017
003f87c
Standardize on FTY systemd service template
jimklimov Apr 10, 2017
63cf96f
Revise "git clone" in ci_*.sh to simplify git-diffs
jimklimov May 26, 2017
556a139
For consistency, use 42ity czmq-3.0.2 in valgrind tests too
jimklimov May 26, 2017
472e5f2
For consistency, use 42ity czmq-3.0.2 in valgrind tests too
jimklimov May 26, 2017
3d7dad8
Merge remote-tracking branch 'upstream/master' into czmq4
jimklimov May 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion builds/check_zproject/ci_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ git clone --quiet --depth 1 https://github.com/zeromq/libzmq.git libzmq
### NOTE: Manual edit
case "$CI_CZMQ_VER" in
3)
git clone --quiet -b v3.0.2 --depth 1 https://github.com/42ity/czmq.git czmq
git clone --quiet --depth 1 -b v3.0.2 https://github.com/42ity/czmq.git czmq
;;
4|*)
git clone --quiet --depth 1 https://github.com/zeromq/czmq.git czmq
Expand Down
2 changes: 1 addition & 1 deletion builds/valgrind/ci_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ cd ..
### NOTE: Manual edit
case "$CI_CZMQ_VER" in
3)
git clone --quiet -b v3.0.2 --depth 1 https://github.com/42ity/czmq.git czmq.git
git clone --quiet --depth 1 -b v3.0.2 https://github.com/42ity/czmq.git czmq.git
;;
4|*)
git clone --quiet --depth 1 https://github.com/zeromq/czmq.git czmq.git
Expand Down
2 changes: 1 addition & 1 deletion ci_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ if [ "$BUILD_TYPE" == "default" ] || [ "$BUILD_TYPE" == "default-Werror" ] || [
### NOTE: Manual edit
case "$CI_CZMQ_VER" in
3)
$CI_TIME git clone --quiet -b v3.0.2 --depth 1 https://github.com/42ity/czmq.git czmq
$CI_TIME git clone --quiet --depth 1 -b v3.0.2 https://github.com/42ity/czmq.git czmq
;;
4|*)
$CI_TIME git clone --quiet --depth 1 https://github.com/zeromq/czmq.git czmq
Expand Down
2 changes: 1 addition & 1 deletion install.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Installation model
name - file name

2. type
* systemd-tmpfiles - install $(project.name) to /usr/lib/systemd/tmpfiles.d/
* systemd-tmpfiles - install $(project.name) to /usr/lib/tmpfiles.d/
-->

<install>
Expand Down
17 changes: 11 additions & 6 deletions src/fty-metric-composite-configurator.service.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,18 @@ PartOf=bios.target
[Service]
Type=simple
User=bios
EnvironmentFile=-/usr/share/bios/etc/default/bios
EnvironmentFile=-/usr/share/bios/etc/default/fty__%n.conf
EnvironmentFile=-/etc/default/bios
EnvironmentFile=-/etc/default/fty__fty-metric-composite__%i.conf
Environment="prefix=@prefix@"
ExecStart=@prefix@/bin/fty-metric-composite-configurator
Restart=always
EnvironmentFile=-@prefix@/share/bios/etc/default/bios
EnvironmentFile=-@prefix@/share/bios/etc/default/bios__%n.conf
EnvironmentFile=-@prefix@/share/fty/etc/default/fty
EnvironmentFile=-@prefix@/share/fty/etc/default/fty__%n.conf
EnvironmentFile=-@sysconfdir@/default/bios
EnvironmentFile=-@sysconfdir@/default/bios__%n.conf
EnvironmentFile=-@sysconfdir@/default/fty
EnvironmentFile=-@sysconfdir@/default/fty__%n.conf
EnvironmentFile=-@sysconfdir@/default/fty__fty-metric-composite__%i.conf
Environment="prefix=@prefix@"
ExecStart=@prefix@/bin/fty-metric-composite-configurator

[Install]
WantedBy=bios.target
6 changes: 3 additions & 3 deletions src/fty-metric-composite.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# create runtime directories for bios-agent-rt
d /var/lib/bios/composite-metrics 0755 bios root
x /var/lib/bios/composite-metrics/*
# create runtime directories for fty-metric-composite
d /var/lib/fty/fty-metric-composite 0755 bios root
x /var/lib/fty/fty-metric-composite/*
17 changes: 12 additions & 5 deletions src/fty-metric-composite@.service.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,18 @@ PartOf=bios.target
[Service]
Type=simple
User=bios
EnvironmentFile=-/usr/share/bios/etc/default/bios
EnvironmentFile=-/usr/share/bios/etc/default/fty__%n.conf
EnvironmentFile=-/etc/default/bios
EnvironmentFile=-/etc/default/fty__fty-metric-composite__%i.conf
ExecStart=@prefix@/bin/fty-metric-composite /var/lib/bios/composite-metrics/%i.cfg
Restart=always
EnvironmentFile=-@prefix@/share/bios/etc/default/bios
EnvironmentFile=-@prefix@/share/bios/etc/default/bios__%n.conf
EnvironmentFile=-@prefix@/share/fty/etc/default/fty
EnvironmentFile=-@prefix@/share/fty/etc/default/fty__%n.conf
EnvironmentFile=-@sysconfdir@/default/bios
EnvironmentFile=-@sysconfdir@/default/bios__%n.conf
EnvironmentFile=-@sysconfdir@/default/fty
EnvironmentFile=-@sysconfdir@/default/fty__%n.conf
EnvironmentFile=-@sysconfdir@/default/fty__fty-metric-composite__%i.conf
Environment="prefix=@prefix@"
ExecStart=@prefix@/bin/fty-metric-composite /var/lib/fty/fty-metric-composite/%i.cfg
Restart=always

[Install]
Expand Down
4 changes: 2 additions & 2 deletions src/fty_metric_composite_configurator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@

static const char *AGENT_NAME = "fty-metric-composite-configurator";
static const char *ENDPOINT = "ipc://@/malamute";
static const char *DIRECTORY = "/var/lib/bios/composite-metrics";
static const char *STATE_FILE = "/var/lib/bios/composite-metrics/configurator_state_file";
static const char *DIRECTORY = "/var/lib/fty/fty-metric-composite";
static const char *STATE_FILE = "/var/lib/fty/fty-metric-composite/configurator_state_file";

#define DEFAULT_LOG_LEVEL LOG_WARNING

Expand Down