Skip to content

Commit 7ce03b4

Browse files
spark404spark404
committed
Summary: Fixup usage server for packaging
Make the start method work again with jsvc Move the usageApplicationContext to resources and add resources to the pom.xml Remove the old components file Add mysql-connector as a runtime dependency Rename the usage package and the files to cloudstack Change paths to the new proposed locations
1 parent 195c6c1 commit 7ce03b4

6 files changed

Lines changed: 29 additions & 97 deletions

File tree

‎packaging/centos63/cloud-usage.rc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232

3333
. /etc/rc.d/init.d/functions
3434

35-
SHORTNAME="cloud-usage"
35+
SHORTNAME="cloudstack-usage"
3636
PIDFILE=/var/run/"$SHORTNAME".pid
3737
LOCKFILE=/var/lock/subsys/"$SHORTNAME"
38-
LOGFILE=/var/log/cloud/usage/usage.log
38+
LOGFILE=/var/log/cloudstack/usage/usage.log
3939
PROGNAME="CloudStack Usage Monitor"
4040
CLASS="com.cloud.usage.UsageServer"
4141
PROG="jsvc"
@@ -57,12 +57,12 @@ export JAVA_HOME
5757

5858
SCP=""
5959
DCP=""
60-
UCP=`ls /usr/share/cloud/usage/java/* | tr '\n' ':'`
60+
UCP=`ls /usr/share/cloudstack-usage/cloud-usage-*.jar`":"`ls /usr/share/cloudstack-usage/lib/* | tr '\n' ':'`
6161
JCP="/usr/share/java/commons-daemon.jar"
6262

6363
# We need to append the JSVC daemon JAR to the classpath
6464
# AgentShell implements the JSVC daemon methods
65-
export CLASSPATH="$SCP:$DCP:$UCP:$JCP:/etc/sysconfig
65+
export CLASSPATH="$SCP:$DCP:$UCP:$JCP:/etc/sysconfig"
6666

6767
start() {
6868
if [ -s "$PIDFILE" ] && kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then

‎packaging/centos63/cloud.spec‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -240,10 +240,11 @@ install -D plugins/hypervisors/kvm/target/cloud-plugin-hypervisor-kvm-%{_maventa
240240
cp plugins/hypervisors/kvm/target/dependencies/* ${RPM_BUILD_ROOT}/usr/share/cloud/java
241241

242242
# Usage server
243-
install -D usage/target/cloud-usage-%{_maventag}.jar ${RPM_BUILD_ROOT}/usr/share/cloud/usage/java/cloud-usage-%{_maventag}.jar
244-
cp usage/target/dependencies/* ${RPM_BUILD_ROOT}/usr/share/cloud/usage/java
245-
install -D packaging/centos63/cloud-usage.rc ${RPM_BUILD_ROOT}/etc/init.d/cloud-usage
246-
mkdir -p ${RPM_BUILD_ROOT}/var/log/cloud/usage/
243+
mkdir -p ${RPM_BUILD_ROOT}/usr/share/%{name}-usage/lib
244+
install -D usage/target/cloud-usage-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-usage/cloud-usage-%{_maventag}.jar
245+
cp usage/target/dependencies/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-usage/lib/
246+
install -D packaging/centos63/cloud-usage.rc ${RPM_BUILD_ROOT}/%{_sysconfdir}/init.d/%{name}-usage
247+
mkdir -p ${RPM_BUILD_ROOT}/var/log/%{name}/usage/
247248

248249
%clean
249250
[ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT}
@@ -335,14 +336,15 @@ fi
335336
%doc NOTICE
336337

337338
%files common
338-
%attr(0755,root,root) /usr/share/cloudstack-scripts/
339+
%attr(0755,root,root) %{_datadir}/cloudstack-scripts/
339340
%doc LICENSE
340341
%doc NOTICE
341342

342343
%files usage
343-
%attr(0755,root,root) %{_sysconfdir}/init.d/cloud-usage
344-
%attr(0644,root,root) /usr/share/cloud/usage/java/*.jar
345-
%dir /var/log/cloud/usage
344+
%attr(0755,root,root) %{_sysconfdir}/init.d/%{name}-usage
345+
%attr(0644,root,root) %{_datadir}/%{name}-usage/*.jar
346+
%attr(0644,root,root) %{_datadir}/%{name}-usage/lib/*.jar
347+
%dir /var/log/%{name}/usage
346348
%doc LICENSE
347349
%doc NOTICE
348350

‎usage/conf/usage-components.xml.in‎

Lines changed: 0 additions & 80 deletions
This file was deleted.

‎usage/pom.xml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,22 @@
3131
<artifactId>cloud-server</artifactId>
3232
<version>${project.version}</version>
3333
</dependency>
34+
<dependency>
35+
<groupId>mysql</groupId>
36+
<artifactId>mysql-connector-java</artifactId>
37+
<version>${cs.mysql.version}</version>
38+
<scope>runtime</scope>
39+
</dependency>
3440
</dependencies>
3541
<build>
3642
<defaultGoal>install</defaultGoal>
3743
<sourceDirectory>src</sourceDirectory>
3844
<testSourceDirectory>test</testSourceDirectory>
45+
<resources>
46+
<resource>
47+
<directory>resources</directory>
48+
</resource>
49+
</resources>
3950
<plugins>
4051
<plugin>
4152
<groupId>org.apache.maven.plugins</groupId>
@@ -102,7 +113,6 @@
102113
</execution>
103114
</executions>
104115
</plugin>
105-
106116
</plugins>
107117
</build>
108118
</project>

usage/conf/usageApplicationContext.xml.in renamed to usage/resources/usageApplicationContext.xml

File renamed without changes.

‎usage/src/com/cloud/usage/UsageServer.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ public class UsageServer {
3838
*/
3939
public static void main(String[] args) {
4040
initLog4j();
41-
ApplicationContext appContext = new ClassPathXmlApplicationContext("usageApplicationContext.xml");
42-
4341
UsageServer usage = new UsageServer();
4442
usage.init(args);
45-
usage.start(appContext);
43+
usage.start();
4644
}
4745

4846
public void init(String[] args) {
4947
}
5048

51-
public void start(ApplicationContext appContext) {
49+
public void start() {
50+
ApplicationContext appContext = new ClassPathXmlApplicationContext("usageApplicationContext.xml");
51+
5252
try {
5353
ComponentContext.initComponentsLifeCycle();
5454
} catch(Exception e) {

0 commit comments

Comments
 (0)