Skip to content

Declutter logs #329

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

Merged
merged 3 commits into from
Nov 14, 2019
Merged

Declutter logs #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
257a902
Disable colors on systemd
kzys Nov 13, 2019
c4eb079
Remove set -x to declutter logs
kzys Nov 13, 2019
df2d580
Log vmID as like other log messages
kzys Nov 13, 2019
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
2 changes: 1 addition & 1 deletion runtime/integ_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const runtimeConfigPath = "/etc/containerd/firecracker-runtime.json"
var defaultRuntimeConfig = Config{
FirecrackerBinaryPath: "/usr/local/bin/firecracker",
KernelImagePath: "/var/lib/firecracker-containerd/runtime/default-vmlinux.bin",
KernelArgs: "ro console=ttyS0 noapic reboot=k panic=1 pci=off nomodules systemd.journald.forward_to_console systemd.unit=firecracker.target init=/sbin/overlay-init",
KernelArgs: "ro console=ttyS0 noapic reboot=k panic=1 pci=off nomodules systemd.journald.forward_to_console systemd.log_color=false systemd.unit=firecracker.target init=/sbin/overlay-init",
RootDrive: "/var/lib/firecracker-containerd/runtime/default-rootfs.img",
CPUCount: 1,
CPUTemplate: "T2",
Expand Down
2 changes: 1 addition & 1 deletion runtime/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ func (s *service) StartShim(shimCtx context.Context, containerID, containerdBina

log.Info("will start a single-task VM since no VMID has been provided")
} else {
log.Info("will start a persistent VM")
log.WithField("vmID", s.vmID).Info("will start a persistent VM")
}

client, err := ttrpcutil.NewClient(containerdTTRPCAddress)
Expand Down
2 changes: 1 addition & 1 deletion tools/docker/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
set -ex
set -e

chmod a+rwx ${FICD_LOG_DIR}

Expand Down
2 changes: 0 additions & 2 deletions tools/image-builder/files_debootstrap/sbin/overlay-init
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
# express or implied. See the License for the specific language governing
# permissions and limitations under the License.

set -x

# Parameters:
# 1. rw_root -- path where the read/write root is mounted
# 2. work_dir -- path to the overlay workdir (must be on same filesystem as rw_root)
Expand Down