annotate scripts/server-ctl @ 3682:193f316dbbe9

More transitive-property support. - Implemented transitive properties in sort and group specs. Sort/group specs can now be lists of specs. - All regression tests except for one metakit backend test related to metakit having no representation of NULL pass - Fixed more PEP 8 whitespace peeves (and probably introduced some new ones :-) - Moved Proptree from support.py to hyperdb.py due to circular import - Moved some proptree-specific methods from Class to Proptree - Added a test for sorting by ids -> should be numeric sort (which now really works for all backends) - Added "required" attribute to all property classes in hyperdb (e.g., String, Link,...), see Feature Requests [SF#539081] -> factored common stuff to _Type. Note that I also converted to a new-style class when I was at it. Bad: The repr changes for new-style classes which made some SQL backends break (!) because the repr of Multilink is used in the schema storage. Fixed the repr to be independent of the class type. - Added get_required_props to Class. Todo: should also automagically make the key property required... - Add a sort_repr method to property classes. This defines the sort-order. Individual backends may use diffent routines if the outcome is the same. This one has a special case for id properties to make the sorting numeric. Using these methods isn't mandatory in backends as long as the sort-order is correct. - Multilink sorting takes orderprop into account. It used to sort by ids. You can restore the old behaviour by specifying id as the orderprop of the Multilink if you really need that. - If somebody specified a Link or Multilink as orderprop, we sort by labelprop of that class -- not transitively by orderprop. I've resited the tempation to implement recursive orderprop here: There could even be loops if several classes specify a Link or Multilink as the orderprop... - Fixed a bug in Metakit-Backend: When sorting by Links, the backend would do a natural join to the Link class. It would rename the "id" attribute before joining but *not* all the other attributes of the joined class. So in one test-case we had a name-clash with priority.name and status.name when sorting *and* grouping by these attributes. Depending on the order of joining this would produce a name-clash with broken sort-results (and broken display if the original class has an attribute that clashes). I'm now doing the sorting of Links in the generic filter method for the metakit backend. I've left the dead code in the metakit-backend since correctly implementing this in the backend will probably be more efficient. - updated doc/design.html with the new docstring of filter.
author Ralf Schlatterbeck <schlatterbeck@users.sourceforge.net>
date Mon, 21 Aug 2006 12:19:48 +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/