Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix kdp3 version #1209

Merged
merged 2 commits into from May 16, 2014
Merged

Fix kdp3 version #1209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3333058
bounce KDP3 to latest.
jessp011 May 15, 2014
9d75e18
this fix should not be in this branch. headache.
jessp011 May 15, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions batch/kaltura_batch.sh
View file
Open in desktop
@@ -1,6 +1,8 @@
#!/bin/bash
. /etc/kaltura.d/system.ini

echo `date`

#
# batchMgr This shell script takes care of starting and stopping a Kaltura Batch Service
#
Expand Down Expand Up @@ -78,15 +80,15 @@ start() {
echo "Removing stale lock file at $LOCKFILE"
rm -f $LOCKFILE
start_scheduler
return $?
return 1
fi
else
if [ "X$KP" != "X" ]; then
echo "Batch is running as $KP without a $LOCKFILE"
return 0
fi
start_scheduler
return $?
return 0
fi
}

Expand All @@ -97,11 +99,9 @@ start_scheduler() {
if [ "$?" -eq 0 ]; then
echo_success
echo
return 0
else
echo_failure
echo
return 1
fi
}

Expand Down Expand Up @@ -161,3 +161,4 @@ case "$1" in
exit 0
;;
esac
exit 0
6 changes: 3 additions & 3 deletions deployment/base/scripts/init_content/01.uiConf.-4.template.xml
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@
<name>Widescreen player - light skin</name>
<width>400</width>
<height>285</height>
<swfUrl>/flash/kdp3/v3.5.21/kdp3.swf</swfUrl>
<swfUrl>/flash/kdp3/v3.9.8/kdp3.swf</swfUrl>
<useCdn>1</useCdn>
<tags>kdp3,player</tags>
<creationMode>2</creationMode>
Expand All @@ -36,12 +36,12 @@
<name>Multiple playlists - dark skin</name>
<width>740</width>
<height>330</height>
<swfUrl>/flash/kdp3/v3.5.21/kdp3.swf</swfUrl>
<swfUrl>/flash/kdp3/v3.9.8/kdp3.swf</swfUrl>
<useCdn>1</useCdn>
<tags>kdp3,playlist</tags>
<creationMode>2</creationMode>
<confFile path="ui_conf/MultiPlaylists.xml" />
<confFileFeatures path="ui_conf/MultiPlaylists.features.xml" />
</uiConf>
</request>
</xml>
</xml>