ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CMSDIST/dbs-server.spec
(Generate patch)

Comparing COMP/CMSDIST/dbs-server.spec (file contents):
Revision 1.73 by valya, Sat Feb 21 01:58:07 2009 UTC vs.
Revision 1.80 by valya, Tue Mar 10 23:10:43 2009 UTC

# Line 1 | Line 1
1 < ### RPM cms dbs-server DBS_2_0_6_pre1
1 > ### RPM cms dbs-server DBS_2_0_6_pre5
2  
3   %define cvstag %{realversion}
4   # define version of DBS to use, it's schema version
# Line 47 | Line 47 | cat > %{i}/Servers/JavaServer/bin/dbs_in
47   #!/bin/sh
48   export MYAREA=rpm_install_area
49   export SCRAM_ARCH=slc4_ia32_gcc345
50 + export APT_VERSION=0.5.15lorg3.2-cmp
51   source \$MYAREA/\$SCRAM_ARCH/external/apt/\$APT_VERSION/etc/profile.d/init.sh
52   source \$MYAREA/%{pkgrel}/etc/profile.d/init.sh
53   # set DBS DBs
# Line 60 | Line 61 | function dbs_stop()
61   {
62      me=\`whoami\`
63      echo $"Stop mysqld|tomcat running under \$me account..."
64 <    ps -w -w -f -u\$me | egrep "mysqld|tomcat" | grep -v egrep | awk '{print "kill -9 "\$2""}'|/bin/sh
64 >    ps -w -w -f -u\$me | grep mysqld | grep \$MYSQL_PORT | grep -v grep | awk '{print "kill -9 "\$2""}'|/bin/sh
65 >    ps -w -w -f -u\$me | grep tomcat | grep -v grep | awk '{print "kill -9 "\$2""}'|/bin/sh
66   }
67   function dbs_start()
68   {
# Line 76 | Line 78 | function dbs_start()
78   function dbs_status()
79   {
80      me=\`whoami\`
81 <    dbs_mysqld=\`ps -w -w -f -u\$me | egrep "mysqld" | grep -v egrep | wc -l\`
81 >    dbs_mysqld=\`ps -w -w -f -u\$me | egrep "mysqld" | grep \$MYSQL_PORT| grep -v egrep | wc -l\`
82      dbs_tomcat=\`ps -w -w -f -u\$me | egrep "tomcat" | grep -v egrep | wc -l\`
83      if [ \${dbs_tomcat} -ne 1 ]; then
84         echo "Tomcat server is not running"
# Line 194 | Line 196 | echo "+++ Clean-up mysqld|tomcat process
196   #ps -w -w -f -u`whoami` | egrep "mysqld|tomcat" | grep -v egrep | awk '{print "kill -9 "$2""}' |/bin/sh
197   #killall -q mysqld
198   #cat $MYSQL_ROOT/mysqldb/mysqld.pid
199 < $MYSQL_ROOT/bin/mysqladmin -uroot -pcms --socket=$MYSQL_SOCK --port=3316 shutdown
199 > $MYSQL_ROOT/bin/mysqladmin -uroot -pcms --socket=$MYSQL_SOCK --port=$MYSQL_PORT shutdown
200   killall -q tomcat
201  
202   # made correct link to LibValut

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines