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.111 by valya, Mon Aug 31 19:28:10 2009 UTC vs.
Revision 1.139 by afaq, Mon Sep 27 14:04:03 2010 UTC

# Line 1 | Line 1
1 < ### RPM cms dbs-server DBS_2_0_8_patch_2
1 > ### RPM cms dbs-server DBS_2_1_4
2  
3   %define cvstag %{realversion}
4   # define version of DBS to use, it's schema version
# Line 46 | Line 46 | mkdir -p %{i}/Servers/JavaServer/bin
46   cat > %{i}/Servers/JavaServer/bin/dbs_init.sh << DBS_INIT_EOF
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
49 > export SCRAM_ARCH=scram_arch
50 > export APT_VERSION=apt_version
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 60 | MYSQL_ERR=\$MYSQL_PATH/error.log
60   function dbs_stop()
61   {
62      me=\`whoami\`
63 <    echo $"Stop mysqld|tomcat running under \$me account from $MYAREA area..."
64 <    ps -w -w -f -u\$me | grep mysqld | grep $MYAREA | grep \$MYSQL_PORT | grep -v grep | awk '{print "kill -9 "\$2""}'|/bin/sh
65 <    ps -w -w -f -u\$me | grep tomcat | grep $MYAREA | grep -v grep | awk '{print "kill -9 "\$2""}'|/bin/sh
63 >    echo $"Stop mysqld|tomcat running under \$me account from \$MYAREA area..."
64 >    ps -w -w -f -u\$me | grep mysqld | grep "\$MYAREA" | grep \$MYSQL_PORT | grep -v grep | awk '{print "kill -9 "\$2""}'|/bin/sh
65 >    ps -w -w -f -u\$me | grep tomcat | grep "\$MYAREA" | grep -v grep | awk '{print "kill -9 "\$2""}'|/bin/sh
66   }
67   function dbs_start()
68   {
# Line 78 | 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 $MYAREA | grep \$MYSQL_PORT| grep -v egrep | wc -l\`
82 <    dbs_tomcat=\`ps -w -w -f -u\$me | egrep "tomcat" | grep $MYAREA | grep -v egrep | wc -l\`
81 >    dbs_mysqld=\`ps -w -w -f -u\$me | egrep "mysqld" | grep "\$MYAREA" | grep \$MYSQL_PORT| grep -v egrep | wc -l\`
82 >    dbs_tomcat=\`ps -w -w -f -u\$me | egrep "tomcat" | grep "\$MYAREA" | grep -v egrep | wc -l\`
83      if [ \${dbs_tomcat} -ne 1 ]; then
84         echo "Tomcat server is not running"
85         break
# Line 88 | Line 88 | function dbs_status()
88         echo "MySQL server is not running"
89         exit 1
90      fi
91 <    ps -w -w -f -u\$me | grep $MYAREA | egrep "mysqld" | grep -v egrep | awk '{print "MySQLd server running, pid="\$2""}'
92 <    ps -w -w -f -u\$me | grep $MYAREA | egrep "tomcat" | grep -v egrep | awk '{print "Tomcat server running, pid="\$2""}'
91 >    ps -w -w -f -u\$me | grep "\$MYAREA" | egrep "mysqld" | grep -v egrep | awk '{print "MySQLd server running, pid="\$2""}'
92 >    ps -w -w -f -u\$me | grep "\$MYAREA" | egrep "tomcat" | grep -v egrep | awk '{print "Tomcat server running, pid="\$2""}'
93      echo "For more information please have a look at tomcat log:"
94      echo "\$APACHE_TOMCAT_ROOT/logs/catalina.out"
95   }
# Line 207 | Line 207 | cp $DBS_SERVER_ROOT/Servers/JavaServer/D
207   cp -f $DBS_LIBS_ROOT/lib/*.jar $APACHE_TOMCAT_ROOT/common/lib
208  
209   # Fix path in dbs_init.sh file since now we know install area
210 < cat $DBS_SERVER_ROOT/Servers/JavaServer/bin/dbs_init.sh | sed "s,rpm_install_area,$RPM_INSTALL_PREFIX,g" > \
210 > cat $DBS_SERVER_ROOT/Servers/JavaServer/bin/dbs_init.sh | \
211 >    sed "s,scram_arch,$SCRAM_ARCH,g" | \
212 >    sed "s,apt_version,$APT_VERSION,g" | \
213 >    sed "s,rpm_install_area,$RPM_INSTALL_PREFIX,g" > \
214      $DBS_SERVER_ROOT/Servers/JavaServer/bin/dbs_init.sh.new
215   /bin/mv -f $DBS_SERVER_ROOT/Servers/JavaServer/bin/dbs_init.sh.new $DBS_SERVER_ROOT/Servers/JavaServer/bin/dbs_init.sh
216   echo "+++ Fix path in dbs_init.sh"

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines