Skip to content

Commit

Permalink
Fix backup/restore procedure
Browse files Browse the repository at this point in the history
- Restore the "active from" timestamp
- Add to backup/restore the "active to" timestamp
  • Loading branch information
DavidePrincipi committed Apr 10, 2024
1 parent abc7c42 commit 790bfb1
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 17 deletions.
29 changes: 12 additions & 17 deletions imageroot/actions/restore-module/06copyenv
Original file line number Diff line number Diff line change
@@ -1,28 +1,14 @@
#!/usr/bin/env python3

#
# Copyright (C) 2022 Nethesis S.r.l.
# http://www.nethesis.it - nethserver@nethesis.it
#
# This script is part of NethServer.
#
# NethServer is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License,
# or any later version.
#
# NethServer is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with NethServer. If not, see COPYING.
# Copyright (C) 2024 Nethesis S.r.l.
# SPDX-License-Identifier: GPL-3.0-or-later
#

import sys
import json
import agent
import datetime

request = json.load(sys.stdin)

Expand All @@ -33,5 +19,14 @@ for evar in [
"LOKI_API_AUTH_PASSWORD",
"LOKI_LOGS_INGRESS_TOKEN",
"LOKI_RETENTION_PERIOD",
"LOKI_ACTIVE_FROM",
]:
agent.set_env(evar, original_environment[evar])

if "LOKI_ACTIVE_TO" in original_environment:
agent.set_env("LOKI_ACTIVE_TO", original_environment["LOKI_ACTIVE_TO"])
else:
try:
agent.set_env("LOKI_ACTIVE_TO", datetime.datetime.fromtimestamp(os.stat('active_to.tstamp').st_mtime).astimezone().isoformat())
except Exception as ex:
print(agent.SD_WARNING + "Cannot restore LOKI_ACTIVE_TO:", str(ex), file=sys.stderr)
13 changes: 13 additions & 0 deletions imageroot/bin/module-cleanup-state
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/bash

#
# Copyright (C) 2024 Nethesis S.r.l.
# SPDX-License-Identifier: GPL-3.0-or-later
#

set -e

# Redirect any output to the journal (stderr)
exec 1>&2

rm -vf active_to.tstamp
13 changes: 13 additions & 0 deletions imageroot/bin/module-dump-state
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/bash

#
# Copyright (C) 2024 Nethesis S.r.l.
# SPDX-License-Identifier: GPL-3.0-or-later
#

set -e

# Redirect any output to the journal (stderr)
exec 1>&2

touch active_to.tstamp
1 change: 1 addition & 0 deletions imageroot/etc/state-include.conf
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
volumes/loki-server-data
state/active_to.tstamp

0 comments on commit 790bfb1

Please sign in to comment.