Skip to content

Commit 1928af5

Browse files
mister-teddyTuyetGiangjenkins-fansWilladsen, Gloria (CNTR)gloriajw
authored
Krombacher-23 (#964)
* Update devapp1.yml * not switching scene on context menu open (#968) * Issue 967 Stage visibility (#969) * Update package.json * Update README.md * not switching scene on context menu open (#968) * fix stage visibility not persisted on table switch * stop removing stream automatically on disconnect (#976) * place avatar on top jitsi window (#978) * Change message noti when sendding email (#979) * change american flag to british flag (#983) * resize avatar on top jitsi window (#980) * Remove Shape, Media, Stream out of media list filter (#989) * wait 3 minute * fix playwright test * Remove Stream in edit, add stream in filter (#993) * remove shape * change american flag to british flag * Fix send email (#994) * certbot renew for all three types of servers * Dependeabot Security updates. (#998) * Bump moment from 2.29.1 to 2.29.4 in /ui/dashboard (#997) Bumps [moment](https://github.com/moment/moment) from 2.29.1 to 2.29.4. - [Release notes](https://github.com/moment/moment/releases) - [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md) - [Commits](moment/moment@2.29.1...2.29.4) --- updated-dependencies: - dependency-name: moment dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump terser from 4.8.0 to 4.8.1 in /ui/dashboard (#996) Bumps [terser](https://github.com/terser/terser) from 4.8.0 to 4.8.1. - [Release notes](https://github.com/terser/terser/releases) - [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md) - [Commits](terser/terser@v4.8.0...v4.8.1) --- updated-dependencies: - dependency-name: terser dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: TuyetGiang <30744004+TuyetGiang@users.noreply.github.com> Co-authored-by: Giang <giang281197@gmail.com> Co-authored-by: gloriajw <aagg@comcast.net> Co-authored-by: Willadsen, Gloria (CNTR) <Gloria.Willadsen@Intelsat.com> Co-authored-by: gloriajw <gloriajw@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 17fd3b9 commit 1928af5

File tree

22 files changed

+154
-37
lines changed

22 files changed

+154
-37
lines changed

‎.github/workflows/devapp1.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: DEVAPP1 CI
66
on:
77
# Triggers the workflow on push or approved pull request on R1-2021 branch
88
push:
9-
branches: [ Stiegl-22 ]
9+
branches: [ Krombacher-23 ]
1010

1111
# Allows you to run this workflow manually from the Actions tab
1212
workflow_dispatch:
@@ -32,7 +32,7 @@ jobs:
3232
script: |
3333
cd /home/upstage/upstage/ui/dashboard/
3434
git fetch
35-
git checkout Stiegl-22
35+
git checkout Krombacher-23
3636
git pull
3737
yarn
3838
yarn build:dev

‎.github/workflows/playwright-dev.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Playwright Tests
2+
on:
3+
push:
4+
branches: [ Stiegl-22 ]
5+
pull_request:
6+
branches: [ Stiegl-22 ]
7+
jobs:
8+
test:
9+
timeout-minutes: 60
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2
13+
- uses: actions/setup-node@v2
14+
with:
15+
node-version: '14.x'
16+
- name: Install dependencies
17+
working-directory: ./ui/dashboard
18+
run: yarn
19+
- name: Install Playwright Browsers
20+
working-directory: ./ui/dashboard
21+
run: npx playwright install --with-deps
22+
- name: Run Playwright tests
23+
working-directory: ./ui/dashboard
24+
run: yarn playwright test
25+
- uses: actions/upload-artifact@v2
26+
if: always()
27+
with:
28+
name: playwright-report
29+
path: ui/dashboard/playwright-report/
30+
retention-days: 30

‎.github/workflows/playwright.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: Playwright Tests
22
on:
33
push:
4-
branches: [ main, Stiegl-22 ]
4+
branches: [ main ]
55
pull_request:
6-
branches: [ main, Stiegl-22 ]
6+
branches: [ main ]
77
jobs:
88
test:
99
timeout-minutes: 60

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# UpStage
22

3-
[![CI](https://github.com/upstage-org/upstage/actions/workflows/devapp1.yml/badge.svg)](https://github.com/upstage-org/upstage/actions/workflows/app1.yml)
3+
[![CI](https://github.com/upstage-org/upstage/actions/workflows/devapp1.yml/badge.svg)](https://github.com/upstage-org/upstage/actions/workflows/devapp1.yml) [![CI](https://github.com/upstage-org/upstage/actions/workflows/playwright.yml/badge.svg)](https://github.com/upstage-org/upstage/actions/workflows/playwright.yml)
44

55
UpStage is a platform for cyberformance - remote players combine digital media in real-time for an online audience. All you need is a web browser!
66

‎mail/mail_utils.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ def create_email(to, subject, html, filenames=[], cc=[], bcc=[], sender=EMAIL_HO
5858
msg = MIMEMultipart('fixed')
5959
with ScopedSession() as local_db_session:
6060
subject_prefix = local_db_session.query(Config).filter(
61-
Config.name == 'EMAIL_SUBJECT_PREFIX').first().value
61+
Config.name == 'EMAIL_SUBJECT_PREFIX').first()
6262
if subject_prefix:
63-
subject = f'{subject_prefix}: {subject}'
63+
subject = f'{subject_prefix.value}: {subject}'
6464
msg.preamble = subject
6565
msg['Subject'] = subject
6666
msg['From'] = f'{EMAIL_HOST_DISPLAY_NAME} <{sender}>'
@@ -108,7 +108,7 @@ def push_mail_info_to_queue(email_info):
108108
db[MONGODB_COLLECTION_EMAIL].insert_one(
109109
email_info if isinstance(email_info, dict) else email_info.__dict__)
110110
client.close()
111-
app.logger('Push email success')
111+
app.logger.info('Push email success')
112112
except Exception as e:
113113
app.logger.error(f'Failed to push email to queue: {e}')
114114

‎run_mail_queue.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@ def __init__(self, logger, total_sleep_time, function_list):
1717

1818
def wait_for_all_then_repeat(self):
1919
async def rerun_these_forever(loop):
20-
start_time = arrow.utcnow().timestamp()
20+
start_time = arrow.utcnow().timestamp
2121
while True:
2222
'''
2323
Subtract the run time from the total sleep time, so we don't slip.
2424
'''
2525
sleep_time = self.total_sleep_time - \
26-
(arrow.utcnow().timestamp() - start_time)
26+
(arrow.utcnow().timestamp - start_time)
2727
if sleep_time <= 0:
2828
self.logger.error(
2929
"Timer diff was negative, sleeping for 30 seconds")
3030
sleep_time = 30
3131
await asyncio.sleep(sleep_time)
3232
self.logger.info(
3333
f"Rerunning these processes: {pprint.pformat([x for x in self.function_list])}")
34-
start_time = arrow.utcnow().timestamp()
34+
start_time = arrow.utcnow().timestamp
3535
await asyncio.wait(
3636
[loop.create_task(f()) for f in self.function_list]
3737
)

‎stage/schema.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ def mutate(self, info, stage_id):
297297
attribute = local_db_session.query(StageAttributeModel).filter(
298298
StageAttributeModel.stage_id == _id, StageAttributeModel.name == 'visibility').first()
299299
if attribute is not None:
300-
attribute.description = True if not attribute.description else False
300+
attribute.description = True if not attribute.description else ''
301301
else:
302302
attribute = StageAttributeModel(
303303
stage_id=_id,

‎system/prod/certbot_renew_script.sh‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
#!/bin/bash
2+
3+
CERTBOT=`whereis certbot | awk '{print $2}'`
4+
DOMAIN=SET_THIS_TO_THE_FULL_DOMAIN_NAME_NOT_HOSTNAME
5+
6+
#STREAMING_SERVER=
7+
#STREAMING_SERVER=1
8+
#SVC_SERVER=
9+
#SVC_SERVER=1
10+
#APP_SERVER=
11+
APP_SERVER=1
12+
13+
CERTCHECK_FILE=/etc/letsencrypt/live/${DOMAIN}/cert.pem
14+
if [[ -n ${SVC_SERVER} ]]
15+
then
16+
OTHER_COPY=/etc/mosquitto/ca_certificates/cert.pem
17+
else
18+
OTHER_COPY=
19+
fi
20+
21+
now_seconds=`date +%s`
22+
sleep 2
23+
$CERTBOT renew
24+
25+
# See if certs were updated. certbot doesn't always return a 0 status when expected.
26+
# So ignore return code issued by certbot and do our own check.
27+
mod_seconds=`/usr/bin/stat -c %Y $CERTCHECK_FILE`
28+
29+
if [[ $now_seconds -lt $mod_seconds ]]
30+
then
31+
echo "Updating..."
32+
systemctl reload nginx
33+
if [[ -n ${SVC_SERVER} ]]
34+
then
35+
other_seconds=`/usr/bin/stat -c %Y $OTHER_COPY`
36+
if [[ $other_seconds -lt $mod_seconds ]]
37+
then
38+
cd /etc/letsencrypt/live/${DOMAIN}
39+
cp * /etc/mosquitto/ca_certificates
40+
chown -R mosquitto:mosquitto /etc/mosquitto/ca_certificates
41+
systemctl reload mosquitto.service >> /var/log/le-renew.log 2>&1
42+
fi
43+
fi
44+
else
45+
echo "No update."
46+
fi
47+
48+
if [[ -n ${APP_SERVER} ]]
49+
then
50+
echo "Restarting anyway in case the svc1 server certs were updated."
51+
systemctl restart upstage.service >> /var/log/le-renew.log 2>&1
52+
systemctl restart event_archive.service >> /var/log/le-renew.log 2>&1
53+
elif [[ -n ${STREAMING_SERVER} ]]
54+
then
55+
echo "Restarting our nodejs streaming service, in case streaming1 server certs were updated. This does not restart jitsi-videobridge, which uses its own cert files"
56+
systemctl restart upstage-streaming.service >> /var/log/le-renew.log 2>&1
57+
fi

‎ui/dashboard/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "dashboard",
3-
"version": "1.22.0",
4-
"versionAlias": "Stiegl-22",
3+
"version": "1.23.0",
4+
"versionAlias": "Krombacher-23",
55
"license": "GPL-3.0",
66
"private": true,
77
"scripts": {

‎ui/dashboard/src/components/LanguageSelector.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<script setup>
1414
import Dropdown from './form/Dropdown.vue';
1515
const flags = {
16-
en: '🇺🇸',
16+
en: '🇬🇧',
1717
de: '🇩🇪',
1818
vn: '🇻🇳',
1919
}

0 commit comments

Comments
 (0)