modules/updateserver/templates/update_update_manifests.erb - Issue 5071748311547904: Issue 1094 - Generate update manifests on the update server

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Delta Between Two Patch Sets: modules/updateserver/templates/update_update_manifests.erb

Issue 5071748311547904: Issue 1094 - Generate update manifests on the update server (Closed)

Left Patch Set: Reduced duplication Created July 25, 2014, 7:17 a.m.

Right Patch Set: Run as user sitescripts Created July 25, 2014, 2:17 p.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Left: Side by side diff | Download
Right: Side by side diff | Download

LEFT	RIGHT
1 #!/bin/bash	1 #!/bin/bash

2	2

3 run_file="/var/run/update_update_manifests"	3 lock_file="<%= sitescripts_var_dir %>/update_update_manifests.lock"

4	4

5 if [[ -f $run_file ]]; then	5 exec 9>"$lock_file"

6 exit 0	6 flock -n 9 \|\| exit 0
Wladimir Palant 2014/07/25 09:50:11 What if this script crashes and doesn't remove the What if this script crashes and doesn't remove the file? Please use a standard solution, e.g. the daemon package (http://libslack.org/daemon/manpages/daemon.1.html). Felix Dahlke 2014/07/25 10:31:15 Using flock now, are you happy with that? It'll ha Show quoted text On 2014/07/25 09:50:11, Wladimir Palant wrote: > What if this script crashes and doesn't remove the file? > > Please use a standard solution, e.g. the daemon package > (http://libslack.org/daemon/manpages/daemon.1.html). Using flock now, are you happy with that? It'll handle crashes. Wladimir Palant 2014/07/25 11:11:02 I'd really prefer a standardized solution that wou Show quoted text On 2014/07/25 10:31:15, Felix H. Dahlke wrote: > Using flock now, are you happy with that? It'll handle crashes. I'd really prefer a standardized solution that would keep the complexity out of our code. Felix Dahlke 2014/07/25 14:17:56 I've looked into daemon, but I don't like the fact Show quoted text On 2014/07/25 11:11:02, Wladimir Palant wrote: > On 2014/07/25 10:31:15, Felix H. Dahlke wrote: > > Using flock now, are you happy with that? It'll handle crashes. > > I'd really prefer a standardized solution that would keep the complexity out of > our code. I've looked into daemon, but I don't like the fact that we have to remember to call the script with it (e.g. when regenerating update manifests manually). If the script guarantees mutual exclusion itself, nothing can go wrong. It seems that flock is the standarised solution for having a script run mutually exclusive - it adds only 3 lines to the script and doesn't require additional packages.
7 fi

8

9 echo "$$" >> "$run_file"

10	7

11 <% repositories_to_sync.each do \|repository\| %>	8 <% repositories_to_sync.each do \|repository\| %>

12 hg pull -q -u -R <%= base_dir %>/<%= repository %>	9 hg pull -q -R "<%= sitescripts_var_dir %>/<%= repository %>"
Wladimir Palant 2014/07/25 09:50:11 Updating is unnecessary, the scripts work with the Updating is unnecessary, the scripts work with the repository data directly rather than the working directory. If you choose to update, you should do it with -r default and --check, see filtermaster module. Felix Dahlke 2014/07/25 10:31:15 Done. Show quoted text On 2014/07/25 09:50:11, Wladimir Palant wrote: > Updating is unnecessary, the scripts work with the repository data directly > rather than the working directory. If you choose to update, you should do it > with -r default and --check, see filtermaster module. Done.
13 <% end %>	10 <% end %>

14	11

15 export PYTHONPATH=/opt/sitescripts	12 export PYTHONPATH=/opt/sitescripts

16 python -m sitescripts.extensions.bin.updateUpdateManifests	13 python -m sitescripts.extensions.bin.updateUpdateManifests
Wladimir Palant 2014/07/25 09:50:11 No need to export the variable if it is only used No need to export the variable if it is only used by a single command: PYTHONPATH=/opt/sitescripts python -m ... Felix Dahlke 2014/07/25 10:31:15 It's shorter that way, I try to stick to 80 chars. Show quoted text On 2014/07/25 09:50:11, Wladimir Palant wrote: > No need to export the variable if it is only used by a single command: > > PYTHONPATH=/opt/sitescripts python -m ... It's shorter that way, I try to stick to 80 chars.
17	14

18 rm -f "$run_file"	15 rm -f "$lock_file"

LEFT	RIGHT