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.

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

[pull] main from labring:main #635

Merged
merged 2 commits into from
Sep 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions controllers/resources/metering/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func executeTask() error {
defer func() {
err := dbClient.Disconnect(dbCtx)
if err != nil {
logger.Error("disconnect mongo client failed: %v", err)
logger.Warn("disconnect mongo client failed: %v", err)
}
}()
prices, err := dbClient.GetAllPricesMap()
Expand All @@ -146,7 +146,7 @@ func executeTask() error {
}
// create tomorrow monitor time series
if err := CreateMonitorTimeSeries(dbClient, now.Add(24*time.Hour)); err != nil {
return fmt.Errorf("failed to create monitor time series: %v", err)
logger.Debug("failed to create monitor time series: %v", err)
}
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion docs/website/src/pages/components/Community/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import DeveloperIcon from '@site/static/icons/developer.svg'
import DiscordIcon from '@site/static/icons/discord.svg'
import GithubIcon from '@site/static/icons/github-light.svg'
import GithubIcon from '@site/static/icons/github.svg'
import React, { useLayoutEffect } from 'react'
import CometIcon from '../Comet'
import Link from '@docusaurus/Link'
Expand Down
2 changes: 1 addition & 1 deletion docs/website/src/pages/components/Footer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Link from '@docusaurus/Link'
import useDocusaurusContext from '@docusaurus/useDocusaurusContext'
import DeveloperIcon from '@site/static/icons/developer.svg'
import DiscordIcon from '@site/static/icons/discord.svg'
import GithubIcon from '@site/static/icons/github-light.svg'
import GithubIcon from '@site/static/icons/github.svg'
import LogoIcon from '@site/static/icons/logo.svg'
import React, { useMemo } from 'react'
import './index.scss'
Expand Down
2 changes: 1 addition & 1 deletion docs/website/src/pages/components/Header/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Link from '@docusaurus/Link'
import Translate from '@docusaurus/Translate'
import GithubIcon from '@site/static/icons/github-light.svg'
import GithubIcon from '@site/static/icons/github.svg'
import MeunIcon from '@site/static/icons/meun.svg'
import LogoIcon from '@site/static/icons/sealos.svg'
import React, { useEffect, useState } from 'react'
Expand Down
10 changes: 0 additions & 10 deletions docs/website/static/icons/github-dark.svg

This file was deleted.

22 changes: 0 additions & 22 deletions docs/website/static/icons/github-light.svg

This file was deleted.

3 changes: 0 additions & 3 deletions docs/website/static/icons/github-navbar.svg

This file was deleted.

21 changes: 2 additions & 19 deletions docs/website/static/icons/github.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading