annotate scripts/server-ctl @ 5525:bb7865241f8a

Make CSV import/export compatible across Python versions (also RDBMS journals) (issue 2550976, issue 2550975). The roundup-admin export and import commands are used for migrating between different database backends. It is desirable that they should be usable also for migrations between Python 2 and Python 3, and in some cases (e.g. with the anydbm backend) this may be required. To be usable for such migrations, the format of the generated CSV files needs to be stable, meaning the same as currently used with Python 2. The export process uses repr() to produce the fields in the CSV files and eval() to convert them back to Python data structures. repr() of strings with non-ASCII characters produces different results for Python 2 and Python 3. This patch adds repr_export and eval_import functions to roundup/anypy/strings.py which provide the required operations that are just repr() and eval() in Python 2, but are more complicated in Python 3 to use data representations compatible with Python 2. These functions are then used in the required places for export and import. repr() and eval() are also used in storing the dict of changed values in the journal for the RDBMS backends. It is similarly desirable that the database be compatible between Python 2 and Python 3, so that export and import do not need to be used for a migration between Python versions for non-anydbm back ends. Thus, this patch changes rdbms_common.py in the places involved in storing journals in the database, not just in those involved in import/export. Given this patch, import/export with non-ASCII characters appear based on some limited testing to work across Python versions, and an instance using the sqlite backend appears to be compatible between Python versions without needing import/export, *if* the sessions/otks databases (which use anydbm) are deleted when changing Python version.
author Joseph Myers <jsm@polyomino.org.uk>
date Sun, 02 Sep 2018 23:48:04 +0000
parents 311ad623e2d1
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1646
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
1 #!/bin/sh
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
2
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
3 #
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
4 # Configuration
3595
311ad623e2d1 use server configuration file [SF#1443805]
Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 1646
diff changeset
5 #
311ad623e2d1 use server configuration file [SF#1443805]
Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 1646
diff changeset
6 CONFFILE="/var/roundup/server-config.ini"
1646
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
7
3595
311ad623e2d1 use server configuration file [SF#1443805]
Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 1646
diff changeset
8 # this will end up with extra space, but it should be ignored in the script
311ad623e2d1 use server configuration file [SF#1443805]
Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 1646
diff changeset
9 PIDFILE=`grep '^pidfile' ${CONFFILE} | awk -F = '{print $2}' `
311ad623e2d1 use server configuration file [SF#1443805]
Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 1646
diff changeset
10 SERVER="/usr/local/bin/roundup-server -C ${CONFFILE}"
1646
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
11 ERROR=0
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
12 ARGV="$@"
3595
311ad623e2d1 use server configuration file [SF#1443805]
Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 1646
diff changeset
13 if [ "x$ARGV" = "x" ] ; then
1646
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
14 ARGS="help"
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
15 fi
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
16
3595
311ad623e2d1 use server configuration file [SF#1443805]
Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 1646
diff changeset
17 if [ -z "${PIDFILE}" ] ; then
311ad623e2d1 use server configuration file [SF#1443805]
Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 1646
diff changeset
18 echo "pidfile option must be set in configuration file"
311ad623e2d1 use server configuration file [SF#1443805]
Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 1646
diff changeset
19 exit 1
311ad623e2d1 use server configuration file [SF#1443805]
Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 1646
diff changeset
20 fi
311ad623e2d1 use server configuration file [SF#1443805]
Alexander Smishlajev <a1s@users.sourceforge.net>
parents: 1646
diff changeset
21
1646
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
22 for ARG in $@ $ARGS
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
23 do
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
24 # check for pidfile
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
25 if [ -f $PIDFILE ] ; then
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
26 PID=`cat $PIDFILE`
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
27 if [ "x$PID" != "x" ] && kill -0 $PID 2>/dev/null ; then
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
28 STATUS="roundup-server (pid $PID) running"
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
29 RUNNING=1
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
30 else
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
31 STATUS="roundup-server (pid $PID?) not running"
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
32 RUNNING=0
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
33 fi
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
34 else
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
35 STATUS="roundup-server (no pid file) not running"
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
36 RUNNING=0
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
37 fi
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
38
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
39 case $ARG in
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
40 start)
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
41 if [ $RUNNING -eq 1 ] ; then
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
42 echo "$0 $ARG: roundup-server (pid $PID) already running"
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
43 continue
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
44 fi
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
45 if $SERVER ; then
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
46 echo "$0 $ARG: roundup-server started"
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
47 else
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
48 echo "$0 $ARG: roundup-server could not be started"
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
49 ERROR=1
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
50 fi
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
51 ;;
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
52 condstart)
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
53 if [ $RUNNING -eq 1 ] ; then
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
54 continue
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
55 fi
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
56 if $SERVER ; then
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
57 echo "$0 $ARG: roundup-server started"
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
58 else
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
59 echo "$0 $ARG: roundup-server could not be started"
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
60 ERROR=1
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
61 fi
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
62 ;;
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
63 stop)
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
64 if [ $RUNNING -eq 0 ] ; then
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
65 echo "$0 $ARG: $STATUS"
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
66 continue
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
67 fi
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
68 if kill $PID ; then
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
69 echo "$0 $ARG: roundup-server stopped"
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
70 else
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
71 echo "$0 $ARG: roundup-server could not be stopped"
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
72 ERROR=2
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
73 fi
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
74 ;;
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
75 status)
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
76 echo $STATUS
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
77 ;;
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
78 *)
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
79 echo "usage: $0 (start|condstart|stop|status)"
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
80 cat <<EOF
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
81
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
82 start - start roundup-server
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
83 condstart - start roundup-server if it's not running
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
84 stop - stop roundup-server
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
85 status - display roundup-server status
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
86
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
87 EOF
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
88 ERROR=3
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
89 ;;
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
90
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
91 esac
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
92
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
93 done
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
94
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
95 exit $ERROR
adc076b825a1 *** empty log message ***
Richard Jones <richard@users.sourceforge.net>
parents:
diff changeset
96

Roundup Issue Tracker: http://roundup-tracker.org/